split bitlbee and weechat roles

playbook.yml

@@ -34,7 +34,8 @@
     - { role: thinkpad, tags: ['thinkpad'], when: "'ThinkPad' in ansible_product_version" }
     - { role: macbook, tags: ['macbook'], when: "'MacBook' in ansible_product_name" }
     - { role: screensaver, tags: ['screensaver'] }
-    - { role: chat, tags: ['chat'] }
+    - { role: bitlbee, tags: ['bitlbee'] }
+    - { role: weechat, tags: ['weechat'] }
     - { role: git-annex, tags: ['git-annex'] }
     - { role: ledger, tags: ['ledger'] }
     - { role: mail, tags: ['mail'] }

roles/bitlbee/tasks/main.yml

@@ -1,28 +1,19 @@
 ---
 - 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: Create Bitlbee systemd unit file directory
   file: path=/etc/systemd/system/bitlbee.service.d state=directory
   tags:
-    - bitlbee
     - firejail
 
 - name: Push Bitlbee socket unit file
@@ -31,33 +22,24 @@
     - reload systemd config
     - restart bitlbee
   tags:
-    - bitlbee
     - firejail
 
 - name: Enable and start Bitlbee
   service: name=bitlbee enabled=yes state=started
   when: bitlbee.run_on == "all"
-  tags:
-    - bitlbee
 
 - name: Remove Bitlbee from trusted unit list
   lineinfile: dest=/usr/local/etc/trusted_units
               state=absent
               line=bitlbee.service
   when: bitlbee.run_on == "all"
-  tags:
-    - bitlbee
 
 - name: Disable Bitlbee
   service: name=bitlbee enabled=no
   when: bitlbee.run_on == "trusted"
-  tags:
-    - bitlbee
 
 - name: Add Bitlbee to trusted unit list
   lineinfile: dest=/usr/local/etc/trusted_units
               state=present
               line=bitlbee.service
   when: bitlbee.run_on == "trusted"
-  tags:
-    - bitlbee

roles/chat/tasks/main.yml

@@ -1,3 +0,0 @@
----
-- include: weechat.yml
-- include: bitlbee.yml

roles/weechat/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: firejail }

roles/weechat/tasks/main.yml

@@ -1,20 +1,15 @@
 ---
 - name: Install aspell English dictionary
   pacman: name=aspell-en state=present
-  tags:
-    - weechat
 
 - name: Install weechat
   pacman: name=weechat state=present
-  tags:
-    - weechat
 
 - name: Jail weechat
   file: src=/usr/bin/firejail
         dest=/usr/local/bin/weechat
         state=link
   tags:
-    - weechat
     - firejail
 
 - name: Push weechat firejail profile
@@ -22,10 +17,7 @@
   notify:
     - activate firejail profiles
   tags:
-    - weechat
     - firejail
 
 - name: Install dunst
   pacman: name=dunst state=present
-  tags:
-    - weechat