From 433283b486adfb2122cb42a070c49aabda50cef7 Mon Sep 17 00:00:00 2001 From: Pig Monkey Date: Fri, 12 Aug 2016 18:57:05 -0700 Subject: [PATCH] split bitlbee and weechat roles --- playbook.yml | 3 ++- .../files/bitlbee-service-override.conf | 0 roles/{chat => bitlbee}/files/bitlbee.conf | 0 roles/{chat => bitlbee}/handlers/main.yml | 0 roles/{chat => bitlbee}/meta/main.yml | 0 .../bitlbee.yml => bitlbee/tasks/main.yml} | 18 ------------------ roles/chat/tasks/main.yml | 3 --- .../files/firejail/weechat.profile | 0 roles/weechat/meta/main.yml | 3 +++ .../weechat.yml => weechat/tasks/main.yml} | 8 -------- 10 files changed, 5 insertions(+), 30 deletions(-) rename roles/{chat => bitlbee}/files/bitlbee-service-override.conf (100%) rename roles/{chat => bitlbee}/files/bitlbee.conf (100%) rename roles/{chat => bitlbee}/handlers/main.yml (100%) rename roles/{chat => bitlbee}/meta/main.yml (100%) rename roles/{chat/tasks/bitlbee.yml => bitlbee/tasks/main.yml} (86%) delete mode 100644 roles/chat/tasks/main.yml rename roles/{chat => weechat}/files/firejail/weechat.profile (100%) create mode 100644 roles/weechat/meta/main.yml rename roles/{chat/tasks/weechat.yml => weechat/tasks/main.yml} (84%) diff --git a/playbook.yml b/playbook.yml index e2f99eb..ba146db 100644 --- a/playbook.yml +++ b/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'] } diff --git a/roles/chat/files/bitlbee-service-override.conf b/roles/bitlbee/files/bitlbee-service-override.conf similarity index 100% rename from roles/chat/files/bitlbee-service-override.conf rename to roles/bitlbee/files/bitlbee-service-override.conf diff --git a/roles/chat/files/bitlbee.conf b/roles/bitlbee/files/bitlbee.conf similarity index 100% rename from roles/chat/files/bitlbee.conf rename to roles/bitlbee/files/bitlbee.conf diff --git a/roles/chat/handlers/main.yml b/roles/bitlbee/handlers/main.yml similarity index 100% rename from roles/chat/handlers/main.yml rename to roles/bitlbee/handlers/main.yml diff --git a/roles/chat/meta/main.yml b/roles/bitlbee/meta/main.yml similarity index 100% rename from roles/chat/meta/main.yml rename to roles/bitlbee/meta/main.yml diff --git a/roles/chat/tasks/bitlbee.yml b/roles/bitlbee/tasks/main.yml similarity index 86% rename from roles/chat/tasks/bitlbee.yml rename to roles/bitlbee/tasks/main.yml index 27fcdd9..74a69c3 100644 --- a/roles/chat/tasks/bitlbee.yml +++ b/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 diff --git a/roles/chat/tasks/main.yml b/roles/chat/tasks/main.yml deleted file mode 100644 index 9e5458d..0000000 --- a/roles/chat/tasks/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- include: weechat.yml -- include: bitlbee.yml diff --git a/roles/chat/files/firejail/weechat.profile b/roles/weechat/files/firejail/weechat.profile similarity index 100% rename from roles/chat/files/firejail/weechat.profile rename to roles/weechat/files/firejail/weechat.profile diff --git a/roles/weechat/meta/main.yml b/roles/weechat/meta/main.yml new file mode 100644 index 0000000..cbc0668 --- /dev/null +++ b/roles/weechat/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: firejail } diff --git a/roles/chat/tasks/weechat.yml b/roles/weechat/tasks/main.yml similarity index 84% rename from roles/chat/tasks/weechat.yml rename to roles/weechat/tasks/main.yml index a6b0036..69f171a 100644 --- a/roles/chat/tasks/weechat.yml +++ b/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