From 114f8c5060f51817f98747e6cfb059140016a364 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sun, 23 May 2021 14:13:17 +0200 Subject: [PATCH 1/6] Optionally installs Vagrant (not on aarch64) --- README.md | 2 +- defaults/main.yml | 3 ++- tasks/main.yml | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ff7ae7c..0095a6e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Role Variables ```yaml # default variables enable_sublime_text: yes - +enable_vagrant: no ``` Dependencies diff --git a/defaults/main.yml b/defaults/main.yml index 83f09f8..f145d63 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,3 +1,4 @@ --- # defaults file for jotbe.dev-tools -enable_sublime_text: yes \ No newline at end of file +enable_sublime_text: yes +enable_vagrant: no \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index 70bc39d..4a21c6f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -7,3 +7,13 @@ tags: - sublime_text when: enable_sublime_text + +- name: Install vagrant + become: yes + package: + name: + - vagrant + state: latest + when: + - ansible_architecture != "aarch64" + - enable_vagrant From 3cd37dfbdd749fcddbcf7daff8caff059fcbc476 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Wed, 30 Jun 2021 21:57:27 +0200 Subject: [PATCH 2/6] Sublime Text: Removes outdated repository (Arch Linux) --- tasks/sublime_text_archlinux.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tasks/sublime_text_archlinux.yml b/tasks/sublime_text_archlinux.yml index 490c321..458a557 100644 --- a/tasks/sublime_text_archlinux.yml +++ b/tasks/sublime_text_archlinux.yml @@ -1,19 +1,13 @@ --- - name: Install Sublime Text (on Archlinux) block: - - name: Add key for Sublime Text repo - shell: - cmd: | - curl -O https://download.sublimetext.com/sublimehq-pub.gpg && \ - sudo pacman-key --add sublimehq-pub.gpg && sudo pacman-key --lsign-key 8A8F901A && \ - rm sublimehq-pub.gpg - - - name: Add repository for Sublime Text + - name: Remove outdated repository for Sublime Text blockinfile: path: /etc/pacman.conf block: | [sublime-text] Server = https://download.sublimetext.com/arch/dev/x86_64 + state: absent - name: Install Sublime Text pacman: From 159d0db83e56484c3de1f433447297024f14d94d Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Fri, 2 Jul 2021 21:30:53 +0200 Subject: [PATCH 3/6] Fixes boolean conditionals --- tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 4a21c6f..6d2b60d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,7 +6,7 @@ apply: tags: - sublime_text - when: enable_sublime_text + when: enable_sublime_text | bool - name: Install vagrant become: yes @@ -16,4 +16,4 @@ state: latest when: - ansible_architecture != "aarch64" - - enable_vagrant + - enable_vagrant | bool From e2180dc4de4d3a26078ae892740c0c6a4a5564ec Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Fri, 2 Jul 2021 21:31:29 +0200 Subject: [PATCH 4/6] Fixes install of Sublime Text 4 on Arch Linux --- tasks/sublime_text_archlinux.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tasks/sublime_text_archlinux.yml b/tasks/sublime_text_archlinux.yml index 458a557..b28efdf 100644 --- a/tasks/sublime_text_archlinux.yml +++ b/tasks/sublime_text_archlinux.yml @@ -10,10 +10,11 @@ state: absent - name: Install Sublime Text - pacman: - name: sublime-text + become: yes + become_user: aur_builder + aur: + name: sublime-text-4 state: latest - update_cache: yes register: sublime_text_installed when: From b76d17171d9c9ef1c1207fb50792c88c2545a3e2 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Fri, 2 Jul 2021 21:39:51 +0200 Subject: [PATCH 5/6] Adds dep kewlfft.aur --- meta/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 227ad9c..30dfbf3 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -47,7 +47,6 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. +dependencies: + - kewlfft.aur \ No newline at end of file From 11759ba63a6d641c67af6454c8c7241459d89bb1 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Fri, 2 Jul 2021 21:44:02 +0200 Subject: [PATCH 6/6] Ensure an aur_builder user if installing dev tools using AUR --- tasks/sublime_text_archlinux.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tasks/sublime_text_archlinux.yml b/tasks/sublime_text_archlinux.yml index b28efdf..198398a 100644 --- a/tasks/sublime_text_archlinux.yml +++ b/tasks/sublime_text_archlinux.yml @@ -1,4 +1,19 @@ --- +- name: Create an AUR user + become: yes + user: + name: aur_builder + create_home: no + group: wheel + +- name: Allow AUR user to run pacman with elevated privileges + become: yes + lineinfile: + path: /etc/sudoers.d/11-install-aur_builder + line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman' + create: yes + validate: 'visudo -cf %s' + - name: Install Sublime Text (on Archlinux) block: - name: Remove outdated repository for Sublime Text