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/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 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 diff --git a/tasks/sublime_text_archlinux.yml b/tasks/sublime_text_archlinux.yml index 490c321..198398a 100644 --- a/tasks/sublime_text_archlinux.yml +++ b/tasks/sublime_text_archlinux.yml @@ -1,25 +1,35 @@ --- +- 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: 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: - name: sublime-text + become: yes + become_user: aur_builder + aur: + name: sublime-text-4 state: latest - update_cache: yes register: sublime_text_installed when: