diff --git a/README.md b/README.md index ef553fa..fd1c165 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,15 @@ provided on the first run when the user is being created. On later runs, providing any password -- whether the current user password or a new one -- will have no effect. +## Tagging + +All tasks are tagged with their role, allowing them to be skipped by tag in +addition to modifying `playbook.yml`. For instance, a system could be built +excluding the entire `media` role and the `dotfiles` section of the `base` +role. + + # ansible-playbook -i localhost playbook.yml --skip-tags "media,dotfiles" + ## AUR All tasks involving the [AUR][4] are tagged `aur`. To provision an AUR-free diff --git a/playbook.yml b/playbook.yml index 4822462..d3ee1dd 100644 --- a/playbook.yml +++ b/playbook.yml @@ -2,33 +2,33 @@ - hosts: localhost sudo: yes roles: - - { role: base } - - { role: fonts } - - { role: x } - - { role: i3 } - - { role: network } - - { role: ntp } - - { role: unbound } - - { role: editors } - - { role: browsers } - - { role: media } - - { role: laptop } - - { role: thinkpad } - - { role: screensaver } - - { role: firejail } - - { role: chat } - - { role: git-annex } - - { role: ledger } - - { role: mail } - - { role: office } - - { role: redshift } - - { role: rtorrent } - - { role: vm } - - { role: yubikey } - - { role: development } - - { role: backup } - - { role: mapping } - - { role: sound } + - { role: base, tags: ['base'] } + - { role: fonts, tags: ['fonts'] } + - { role: x, tags: ['x'] } + - { role: i3, tags: ['i3'] } + - { role: network, tags: ['network'] } + - { role: ntp, tags: ['ntp'] } + - { role: unbound, tags: ['unbound'] } + - { role: editors, tags: ['editors'] } + - { role: browsers, tags: ['browsers'] } + - { role: media, tags: ['media'] } + - { role: laptop, tags: ['laptop'] } + - { role: thinkpad, tags: ['thinkpad'] } + - { role: screensaver, tags: ['screensaver'] } + - { role: firejail, tags: ['firejail'] } + - { role: chat, tags: ['chat'] } + - { role: git-annex, tags: ['git-annex'] } + - { role: ledger, tags: ['ledger'] } + - { role: mail, tags: ['mail'] } + - { role: office, tags: ['office'] } + - { role: redshift, tags: ['redshift'] } + - { role: rtorrent, tags: ['rtorrent'] } + - { role: vm, tags: ['vm'] } + - { role: yubikey, tags: ['yubikey'] } + - { role: development, tags: ['development'] } + - { role: backup, tags: ['backup'] } + - { role: mapping, tags: ['mapping'] } + - { role: sound, tags: ['sound'] } vars_prompt: - name: user_password prompt: "Enter desired user password" diff --git a/roles/base/tasks/cron.yml b/roles/base/tasks/cron.yml index cee2fc9..2a9227b 100644 --- a/roles/base/tasks/cron.yml +++ b/roles/base/tasks/cron.yml @@ -1,9 +1,15 @@ --- - name: Install cronie pacman: name=cronie state=present + tags: + - cron - name: Enable cronie service: name=cronie.service enabled=yes state=started + tags: + - cron - name: Add paccache cleanup to daily cron copy: src=cron/paccache.sh dest=/etc/cron.daily/paccache mode=755 + tags: + - cron diff --git a/roles/base/tasks/dotfiles.yml b/roles/base/tasks/dotfiles.yml index 48b768c..f758f1a 100644 --- a/roles/base/tasks/dotfiles.yml +++ b/roles/base/tasks/dotfiles.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/rcm tags: - aur + - dotfiles become: yes become_user: "{{ user.name }}" @@ -12,6 +13,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/rcm" tags: - aur + - dotfiles become: yes become_user: "{{ user.name }}" @@ -19,8 +21,12 @@ git: repo={{ dotfiles.url }} dest=/home/{{ user.name }}/.dotfiles accept_hostkey=yes update=no become: yes become_user: "{{ user.name }}" + tags: + - dotfiles - name: Install user dotfiles command: rcup {{ dotfiles.rcup_flags }} become: yes become_user: "{{ user.name }}" + tags: + - dotfiles diff --git a/roles/base/tasks/orpie.yml b/roles/base/tasks/orpie.yml index 5d95bf5..ac6ea72 100644 --- a/roles/base/tasks/orpie.yml +++ b/roles/base/tasks/orpie.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/orpie tags: - aur + - orpie become: yes become_user: "{{ user.name }}" @@ -12,6 +13,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/orpie" tags: - aur + - orpie become: yes become_user: "{{ user.name }}" diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index 18f81d1..f74b6f2 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -2,6 +2,8 @@ - name: Install universal base packages pacman: name={{ item }} state=present with_items: "{{ base_packages }}" + tags: + - packages - name: Create AUR directory file: path=/home/{{ user.name }}/{{ aur.dir }} @@ -10,6 +12,7 @@ group={{ user.group }} tags: - aur + - packages - name: Download cower get_url: url=https://aur.archlinux.org/cgit/aur.git/snapshot/cower.tar.gz @@ -18,6 +21,7 @@ group={{ user.group }} tags: - aur + - packages - name: Extract cower unarchive: src=/home/{{ user.name }}/{{ aur.dir }}/cower.tar.gz @@ -28,11 +32,13 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/cower tags: - aur + - packages - name: Build and install cower command: "{{ aur.makepkg }} --skippgpcheck chdir=/home/{{ user.name }}/{{ aur.dir }}/cower" tags: - aur + - packages become: yes become_user: "{{ user.name }}" @@ -42,6 +48,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/{{ aur.helper }} tags: - aur + - packages become: yes become_user: "{{ user.name }}" @@ -49,6 +56,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/{{ aur.helper }}" tags: - aur + - packages become: yes become_user: "{{ user.name }}" @@ -58,6 +66,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/pmount tags: - aur + - packages become: yes become_user: "{{ user.name }}" @@ -65,5 +74,6 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/pmount" tags: - aur + - packages become: yes become_user: "{{ user.name }}" diff --git a/roles/base/tasks/shell.yml b/roles/base/tasks/shell.yml index e5cd0e5..22b4d16 100644 --- a/roles/base/tasks/shell.yml +++ b/roles/base/tasks/shell.yml @@ -4,9 +4,13 @@ with_items: - bash - bash-completion + tags: + - shell - name: Install ZSH pacman: name={{ item }} state=present with_items: - zsh - zsh-completions + tags: + - shell diff --git a/roles/base/tasks/ssh.yml b/roles/base/tasks/ssh.yml index dd423ca..0590a6b 100644 --- a/roles/base/tasks/ssh.yml +++ b/roles/base/tasks/ssh.yml @@ -1,39 +1,63 @@ --- - name: Install OpenSSH pacman: name=openssh state=present + tags: + - ssh - name: Push OpenSSH daemon configuration file template: src=sshd_config.j2 dest=/etc/ssh/sshd_config + tags: + - ssh - name: Create OpenSSH systemd unit file directory file: path=/etc/systemd/system/sshd.socket.d state=directory when: ssh.enable_sshd == "True" + tags: + - ssh - name: Push OpenSSH socket unit file template: src=sshd-socket-override.conf.j2 dest=/etc/systemd/system/sshd.socket.d/override.conf when: ssh.enable_sshd == "True" + tags: + - ssh - name: Enable and start OpenSSH service: name=sshd.socket enabled=yes state=started when: ssh.enable_sshd == "True" + tags: + - ssh - name: Install sshfs pacman: name=sshfs state=present + tags: + - ssh - name: Copy fuse configuration file copy: src=fuse.conf dest=/etc/fuse.conf + tags: + - ssh - name: Install keychain pacman: name=keychain state=present + tags: + - ssh - name: Install x11-ask-pass pacman: name=x11-ssh-askpass state=present + tags: + - ssh - name: Make directory for user SSH key file: path=/home/{{ user.name }}/.ssh state=directory owner={{ user.name }} group={{ user.group }} + tags: + - ssh - name: Install user SSH key copy: src={{ ssh.user_key }} dest=/home/{{ user.name }}/.ssh/id_rsa mode=600 owner={{ user.name }} group={{ user.group }} + tags: + - ssh - name: Install Mosh pacman: name=mosh state=present + tags: + - ssh diff --git a/roles/base/tasks/sudo.yml b/roles/base/tasks/sudo.yml index 5fa763f..a411c3b 100644 --- a/roles/base/tasks/sudo.yml +++ b/roles/base/tasks/sudo.yml @@ -1,9 +1,15 @@ --- - name: Install sudo pacman: name=sudo state=present + tags: + - sudo - name: Add user to wheel group user: name={{ user.name }} groups=wheel append=yes + tags: + - sudo - name: Copy sudo configuration copy: src=sudoers dest=/etc/sudoers mode=440 + tags: + - sudo diff --git a/roles/base/tasks/user.yml b/roles/base/tasks/user.yml index c0667ec..23cc580 100644 --- a/roles/base/tasks/user.yml +++ b/roles/base/tasks/user.yml @@ -1,6 +1,10 @@ --- - name: Create user group group: name={{ user.group }} state=present + tags: + - user - name: Create user and assign to group user: name={{ user.name }} group={{ user.group }} password={{ user_password|password_hash('sha512') }} shell={{ user.shell }} update_password=on_create + tags: + - user diff --git a/roles/chat/tasks/bitlbee.yml b/roles/chat/tasks/bitlbee.yml index a59fd09..45bd60f 100644 --- a/roles/chat/tasks/bitlbee.yml +++ b/roles/chat/tasks/bitlbee.yml @@ -1,15 +1,25 @@ --- - name: Install libOTR pacman: name=libotr state=present + tags: + - bitlbee - name: Install Bitlbee pacman: name=bitlbee state=present + tags: + - bitlbee - name: Copy Bitlbee configuration file copy: src=bitlbee.conf dest=/etc/bitlbee/bitlbee.conf + tags: + - bitlbee - name: Ensure proper ownership of configuration directory file: path=/var/lib/bitlbee group=bitlbee owner=bitlbee + tags: + - bitlbee - name: Enable and start Bitlbee service: name=bitlbee enabled=yes state=started + tags: + - bitlbee diff --git a/roles/chat/tasks/weechat.yml b/roles/chat/tasks/weechat.yml index 5b551d6..8784f67 100644 --- a/roles/chat/tasks/weechat.yml +++ b/roles/chat/tasks/weechat.yml @@ -1,6 +1,10 @@ --- - name: Install weechat pacman: name=weechat state=present + tags: + - weechat - name: Install dunst pacman: name=dunst state=present + tags: + - weechat diff --git a/roles/fonts/tasks/infinality.yml b/roles/fonts/tasks/infinality.yml index 6972c1a..30edf8a 100644 --- a/roles/fonts/tasks/infinality.yml +++ b/roles/fonts/tasks/infinality.yml @@ -7,24 +7,38 @@ with_items: - { line: "\n[infinality-bundle]" } - { line: "Server = http://bohoomil.com/repo/$arch" } + tags: + - infinality - name: Verify root gnupg directory exists file: path=/root/.gnupg/ state=directory + tags: + - infinality - name: Verify dirmngr is configured file: path=/root/.gnupg/dirmngr_ldapservers.conf state=touch + tags: + - infinality - name: Verify dirmngr is running command: dirmngr + tags: + - infinality - name: Install Infinality repository key command: pacman-key -r AE6866C7962DDE58 + tags: + - infinality - name: Trust Infinality repository key command: pacman-key --lsign-key AE6866C7962DDE58 + tags: + - infinality - name: Update package cache pacman: update_cache=yes + tags: + - infinality - name: Install Infinality bundle pacman: name={{ item }} state=present @@ -32,3 +46,5 @@ - freetype2-infinality-ultimate - fontconfig-infinality-ultimate - cairo-infinality-ultimate + tags: + - infinality diff --git a/roles/i3/tasks/rofi.yml b/roles/i3/tasks/rofi.yml index 4e018d3..3e7a546 100644 --- a/roles/i3/tasks/rofi.yml +++ b/roles/i3/tasks/rofi.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/rofi-git tags: - aur + - rofi become: yes become_user: "{{ user.name }}" @@ -12,6 +13,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/rofi-git" tags: - aur + - rofi become: yes become_user: "{{ user.name }}" @@ -21,6 +23,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/rofi-pass-git tags: - aur + - rofi become: yes become_user: "{{ user.name }}" @@ -28,11 +31,14 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/rofi-pass-git" tags: - aur + - rofi become: yes become_user: "{{ user.name }}" - name: Install i3-wm for rofi window switching pacman: name=i3-wm state=present + tags: + - rofi - name: Download teiler (rofi screenshot app) command: cower -dq teiler-git @@ -40,6 +46,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/teiler-git tags: - aur + - rofi become: yes become_user: "{{ user.name }}" @@ -47,6 +54,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/teiler-git" tags: - aur + - rofi become: yes become_user: "{{ user.name }}" @@ -56,6 +64,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/copyq-git tags: - aur + - rofi become: yes become_user: "{{ user.name }}" @@ -63,5 +72,6 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/copyq-git" tags: - aur + - rofi become: yes become_user: "{{ user.name }}" diff --git a/roles/laptop/tasks/light-git.yml b/roles/laptop/tasks/light-git.yml index 3cb711f..33dce97 100644 --- a/roles/laptop/tasks/light-git.yml +++ b/roles/laptop/tasks/light-git.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/light-git tags: - aur + - light-git become: yes become_user: "{{ user.name }}" @@ -12,6 +13,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/light-git" tags: - aur + - light-git become: yes become_user: "{{ user.name }}" diff --git a/roles/laptop/tasks/tlp.yml b/roles/laptop/tasks/tlp.yml index a09b80c..64b1736 100644 --- a/roles/laptop/tasks/tlp.yml +++ b/roles/laptop/tasks/tlp.yml @@ -1,18 +1,30 @@ --- - name: Install tlp-rdw for radio management pacman: name=tlp-rdw state=present + tags: + - tlp - name: Install TLP pacman: name=tlp state=present + tags: + - tlp - name: Copy TLP configuration file copy: src=tlp.conf dest=/etc/default/tlp + tags: + - tlp - name: Mask systemd radio service command: systemctl mask systemd-rfkill@.service + tags: + - tlp - name: Enable TLP service: name=tlp.service enabled=yes + tags: + - tlp - name: Enable TLP sleep service: name=tlp-sleep.service enabled=yes + tags: + - tlp diff --git a/roles/macbook/tasks/mtrack-git.yml b/roles/macbook/tasks/mtrack-git.yml index c68f7fe..79ed6c3 100644 --- a/roles/macbook/tasks/mtrack-git.yml +++ b/roles/macbook/tasks/mtrack-git.yml @@ -1,6 +1,8 @@ --- - name: Copy mtrack-git configuration file copy: src=50-mtrack-git.conf dest=/etc/X11/xorg.conf.d/50-mtrack-git.conf + tags: + - mtrack-git - name: Download xf86-input-mtrack-git command: cower -dq xf86-input-mtrack-git @@ -8,6 +10,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/xf86-input-mtrack-git tags: - aur + - mtrack-git become: yes become_user: "{{ user.name }}" @@ -15,6 +18,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/xf86-input-mtrack-git" tags: - aur + - mtrack-git become: yes become_user: "{{ user.name }}" diff --git a/roles/mail/tasks/contacts.yml b/roles/mail/tasks/contacts.yml index a2d2da1..4a9c8f5 100644 --- a/roles/mail/tasks/contacts.yml +++ b/roles/mail/tasks/contacts.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/goobook-git tags: - aur + - contacts become: yes become_user: "{{ user.name }}" @@ -12,6 +13,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/goobook-git" tags: - aur + - contacts become: yes become_user: "{{ user.name }}" @@ -21,6 +23,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/vdirsyncer tags: - aur + - contacts become: yes become_user: "{{ user.name }}" @@ -28,6 +31,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/vdirsyncer" tags: - aur + - contacts become: yes become_user: "{{ user.name }}" @@ -37,6 +41,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/khard-git tags: - aur + - contacts become: yes become_user: "{{ user.name }}" @@ -44,5 +49,6 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/khard-git" tags: - aur + - contacts become: yes become_user: "{{ user.name }}" diff --git a/roles/media/tasks/abcde.yml b/roles/media/tasks/abcde.yml index 388ad64..19c319e 100644 --- a/roles/media/tasks/abcde.yml +++ b/roles/media/tasks/abcde.yml @@ -4,3 +4,5 @@ with_items: - cdparanoia - abcde + tags: + - abcde diff --git a/roles/media/tasks/beets.yml b/roles/media/tasks/beets.yml index 0147683..102acff 100644 --- a/roles/media/tasks/beets.yml +++ b/roles/media/tasks/beets.yml @@ -10,3 +10,5 @@ - gstreamer0.10-python - gstreamer0.10-ugly - beets + tags: + - beets diff --git a/roles/media/tasks/calibre.yml b/roles/media/tasks/calibre.yml index a099853..03c9d69 100644 --- a/roles/media/tasks/calibre.yml +++ b/roles/media/tasks/calibre.yml @@ -1,3 +1,5 @@ --- - name: Install calibre pacman: name=calibre state=present + tags: + - calibre diff --git a/roles/media/tasks/feh.yml b/roles/media/tasks/feh.yml index 70c2b1a..dccc416 100644 --- a/roles/media/tasks/feh.yml +++ b/roles/media/tasks/feh.yml @@ -1,3 +1,5 @@ --- - name: Install feh pacman: name=feh state=present + tags: + - feh diff --git a/roles/media/tasks/gimp.yml b/roles/media/tasks/gimp.yml index b23efcb..c01576a 100644 --- a/roles/media/tasks/gimp.yml +++ b/roles/media/tasks/gimp.yml @@ -1,3 +1,5 @@ --- - name: Install GIMP pacman: name=gimp state=present + tags: + - gimp diff --git a/roles/media/tasks/gthumb.yml b/roles/media/tasks/gthumb.yml index b05f9e9..d0e00d7 100644 --- a/roles/media/tasks/gthumb.yml +++ b/roles/media/tasks/gthumb.yml @@ -1,3 +1,5 @@ --- - name: Install gThumb pacman: name=gthumb state=present + tags: + - gthumb diff --git a/roles/media/tasks/imagemagick.yml b/roles/media/tasks/imagemagick.yml index db8e346..b5fbd85 100644 --- a/roles/media/tasks/imagemagick.yml +++ b/roles/media/tasks/imagemagick.yml @@ -7,3 +7,5 @@ - librsvg - openjpeg2 - imagemagick + tags: + - imagemagick diff --git a/roles/media/tasks/mpd.yml b/roles/media/tasks/mpd.yml index 8cfdbae..d0c7045 100644 --- a/roles/media/tasks/mpd.yml +++ b/roles/media/tasks/mpd.yml @@ -1,9 +1,15 @@ --- - name: Install mpd pacman: name=mpd state=present + tags: + - mpd - name: Install mpc pacman: name=mpc state=present + tags: + - mpd - name: Install ncmpcpp pacman: name=ncmpcpp state=present + tags: + - mpd diff --git a/roles/media/tasks/mpv.yml b/roles/media/tasks/mpv.yml index 0aec503..c2c23d8 100644 --- a/roles/media/tasks/mpv.yml +++ b/roles/media/tasks/mpv.yml @@ -1,6 +1,10 @@ --- - name: Install youtube-dl pacman: name=youtube-dl state=present + tags: + - mpv - name: Install mpv pacman: name=mpv state=present + tags: + - mpv diff --git a/roles/media/tasks/pianobar.yml b/roles/media/tasks/pianobar.yml index c69b1c7..e99d759 100644 --- a/roles/media/tasks/pianobar.yml +++ b/roles/media/tasks/pianobar.yml @@ -1,3 +1,5 @@ --- - name: Install pianobar pacman: name=pianobar state=present + tags: + - pianobar diff --git a/roles/media/tasks/xfburn.yml b/roles/media/tasks/xfburn.yml index 2dc4621..6f1065f 100644 --- a/roles/media/tasks/xfburn.yml +++ b/roles/media/tasks/xfburn.yml @@ -1,3 +1,5 @@ --- - name: Install xfburn pacman: name=xfburn state=present + tags: + - xfburn diff --git a/roles/network/tasks/pdsh.yml b/roles/network/tasks/pdsh.yml index 913e694..37a27be 100644 --- a/roles/network/tasks/pdsh.yml +++ b/roles/network/tasks/pdsh.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/pdsh tags: - aur + - pdsh become: yes become_user: "{{ user.name }}" @@ -12,6 +13,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/pdsh" tags: - aur + - pdsh become: yes become_user: "{{ user.name }}" diff --git a/roles/office/tasks/cups.yml b/roles/office/tasks/cups.yml index d42ed70..add4aaa 100644 --- a/roles/office/tasks/cups.yml +++ b/roles/office/tasks/cups.yml @@ -8,18 +8,28 @@ - cups-pdf - gutenprint - hplip + tags: + - cups - name: Add a print admin group group: name=printadmin state=present + tags: + - cups - name: Allow the print admin group to administer CUPS lineinfile: dest=/etc/cups/cups-files.conf regexp=^SystemGroup state=present line="SystemGroup sys root printadmin" + tags: + - cups - name: Add the user to the print and print admin groups user: name={{ user.name }} groups=printadmin,lp append=yes + tags: + - cups - name: Enable and start CUPS service: name=org.cups.cupsd.service enabled=yes state=started + tags: + - cups diff --git a/roles/thinkpad/tasks/battery.yml b/roles/thinkpad/tasks/battery.yml index 73d34cd..eff618a 100644 --- a/roles/thinkpad/tasks/battery.yml +++ b/roles/thinkpad/tasks/battery.yml @@ -1,6 +1,8 @@ --- - name: Install acpi_call for TLP battery functions pacman: name=acpi_call state=present + tags: + - battery - name: Download tpacpi-bat command: cower -dq tpacpi-bat @@ -8,6 +10,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/tpacpi-bat tags: - aur + - battery become: yes become_user: "{{ user.name }}" @@ -15,5 +18,6 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/tpacpi-bat" tags: - aur + - battery become: yes become_user: "{{ user.name }}" diff --git a/roles/thinkpad/tasks/fan.yml b/roles/thinkpad/tasks/fan.yml index 4a187ce..3e05685 100644 --- a/roles/thinkpad/tasks/fan.yml +++ b/roles/thinkpad/tasks/fan.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/tpfanco-svn tags: - aur + - fan become: yes become_user: "{{ user.name }}" @@ -12,6 +13,7 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/tpfanco-svn" tags: - aur + - fan become: yes become_user: "{{ user.name }}" @@ -19,8 +21,10 @@ copy: src=thinkfan.conf dest=/etc/thinkfan.conf tags: - aur + - fan - name: Enable and start tpfanco service: name=tpfand enabled=yes state=started tags: - aur + - fan diff --git a/roles/thinkpad/tasks/synaptics.yml b/roles/thinkpad/tasks/synaptics.yml index 35e0522..fe1382f 100644 --- a/roles/thinkpad/tasks/synaptics.yml +++ b/roles/thinkpad/tasks/synaptics.yml @@ -1,6 +1,10 @@ --- - name: Install Synaptics input driver pacman: name=xf86-input-synaptics state=present + tags: + - synaptics - name: Copy Synaptics configuration file copy: src=50-synaptics.conf dest=/etc/X11/xorg.conf.d/50-synaptics.conf + tags: + - synaptics diff --git a/roles/vm/tasks/vagrant.yml b/roles/vm/tasks/vagrant.yml index 4c5acfa..38c6416 100644 --- a/roles/vm/tasks/vagrant.yml +++ b/roles/vm/tasks/vagrant.yml @@ -1,3 +1,5 @@ --- - name: Install vagrant pacman: name=vagrant state=present + tags: + - vagrant diff --git a/roles/vm/tasks/virtualbox.yml b/roles/vm/tasks/virtualbox.yml index e2c336a..d1985e4 100644 --- a/roles/vm/tasks/virtualbox.yml +++ b/roles/vm/tasks/virtualbox.yml @@ -6,6 +6,8 @@ - qt4 - virtualbox-guest-iso - virtualbox + tags: + - virtualbox - name: Download VirtualBox extensions command: cower -dq virtualbox-ext-oracle @@ -13,6 +15,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/virtualbox-ext-oracle tags: - aur + - virtualbox become: yes become_user: "{{ user.name }}" @@ -20,11 +23,16 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/virtualbox-ext-oracle" tags: - aur + - virtualbox become: yes become_user: "{{ user.name }}" - name: Copy kernel modules to load copy: src=modules.conf dest=/etc/modules-load.d/virtualbox.conf + tags: + - virtualbox - name: Add the user to vboxusers group user: name={{ user.name }} groups=vboxusers append=yes + tags: + - virtualbox diff --git a/roles/x/tasks/autocutsel.yml b/roles/x/tasks/autocutsel.yml index 8ca06c9..50d35f6 100644 --- a/roles/x/tasks/autocutsel.yml +++ b/roles/x/tasks/autocutsel.yml @@ -1,3 +1,5 @@ --- - name: Install autocutsel pacman: name=autocutsel state=present + tags: + - autocutsel diff --git a/roles/x/tasks/autorandr.yml b/roles/x/tasks/autorandr.yml index f025ad2..4b60fdb 100644 --- a/roles/x/tasks/autorandr.yml +++ b/roles/x/tasks/autorandr.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/autorandr-git tags: - aur + - autorandr become: yes become_user: "{{ user.name }}" @@ -12,5 +13,6 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/autorandr-git" tags: - aur + - autorandr become: yes become_user: "{{ user.name }}" diff --git a/roles/x/tasks/slim.yml b/roles/x/tasks/slim.yml index 94b946a..3c05067 100644 --- a/roles/x/tasks/slim.yml +++ b/roles/x/tasks/slim.yml @@ -1,6 +1,10 @@ --- - name: Install SLiM pacman: name=slim state=present + tags: + - slim - name: Enable SLiM service: name=slim.service enabled=yes + tags: + - slim diff --git a/roles/x/tasks/srandrd.yml b/roles/x/tasks/srandrd.yml index 9c941d2..26b3c8b 100644 --- a/roles/x/tasks/srandrd.yml +++ b/roles/x/tasks/srandrd.yml @@ -5,6 +5,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/srandrd tags: - aur + - srandrd become: yes become_user: "{{ user.name }}" @@ -12,5 +13,6 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/srandrd" tags: - aur + - srandrd become: yes become_user: "{{ user.name }}" diff --git a/roles/x/tasks/sxhkd.yml b/roles/x/tasks/sxhkd.yml index 231d94e..f9c084c 100644 --- a/roles/x/tasks/sxhkd.yml +++ b/roles/x/tasks/sxhkd.yml @@ -1,3 +1,5 @@ --- - name: Install sxhkd pacman: name=sxhkd state=present + tags: + - sxhkd diff --git a/roles/x/tasks/termite.yml b/roles/x/tasks/termite.yml index 108fc67..f0bb5ee 100644 --- a/roles/x/tasks/termite.yml +++ b/roles/x/tasks/termite.yml @@ -1,6 +1,8 @@ --- - name: Install vte3-ng pacman: name=vte3-ng state=present + tags: + - termite - name: Download termite command: cower -dq termite-git @@ -8,6 +10,7 @@ creates=/home/{{ user.name }}/{{ aur.dir }}/termite-git tags: - aur + - termite become: yes become_user: "{{ user.name }}" @@ -15,5 +18,6 @@ command: "{{ aur.makepkg }} chdir=/home/{{ user.name }}/{{ aur.dir }}/termite-git" tags: - aur + - termite become: yes become_user: "{{ user.name }}" diff --git a/roles/x/tasks/unclutter.yml b/roles/x/tasks/unclutter.yml index a5ba78e..f71f54e 100644 --- a/roles/x/tasks/unclutter.yml +++ b/roles/x/tasks/unclutter.yml @@ -1,3 +1,5 @@ --- - name: Install unclutter pacman: name=unclutter state=present + tags: + - unclutter diff --git a/roles/x/tasks/volwheel.yml b/roles/x/tasks/volwheel.yml index c6dae7b..993bfc8 100644 --- a/roles/x/tasks/volwheel.yml +++ b/roles/x/tasks/volwheel.yml @@ -1,3 +1,5 @@ --- - name: Install volwheel pacman: name=volwheel state=present + tags: + - volwheel