From 9e362a2999bb02f986e79196cf05ce8d6585df67 Mon Sep 17 00:00:00 2001
From: Pig Monkey <pm@pig-monkey.com>
Date: Sat, 30 Jan 2016 14:17:01 -0800
Subject: [PATCH] add clean up tasks for toggling units in config

---
 roles/chat/tasks/bitlbee.yml   | 16 +++++++++++++++-
 roles/macchiato/tasks/main.yml |  4 ++++
 roles/mail/tasks/mailsync.yml  | 14 ++++++++++++++
 roles/ssh/tasks/main.yml       |  4 ++++
 roles/tarsnap/tasks/main.yml   | 12 +++++++++++-
 5 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/roles/chat/tasks/bitlbee.yml b/roles/chat/tasks/bitlbee.yml
index ad07c71..563f5b2 100644
--- a/roles/chat/tasks/bitlbee.yml
+++ b/roles/chat/tasks/bitlbee.yml
@@ -37,7 +37,21 @@
   tags:
     - bitlbee
 
-- name: Push dispatcher to activate Bitlbee on trusted networks
+- 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
diff --git a/roles/macchiato/tasks/main.yml b/roles/macchiato/tasks/main.yml
index 45677c3..8f12cbb 100644
--- a/roles/macchiato/tasks/main.yml
+++ b/roles/macchiato/tasks/main.yml
@@ -11,3 +11,7 @@
 - name: Enable and start macchiato
   service: name=macchiato.service enabled=yes state=started
   when: network.spoof_mac == True
+
+- name: Disable and stop macchiato
+  service: name=macchiato.service enabled=no state=stopped
+  when: network.spoof_mac == False
diff --git a/roles/mail/tasks/mailsync.yml b/roles/mail/tasks/mailsync.yml
index 6f62640..4690715 100644
--- a/roles/mail/tasks/mailsync.yml
+++ b/roles/mail/tasks/mailsync.yml
@@ -20,6 +20,20 @@
   tags:
     - mailsync
 
+- name: Remove mailsync from trusted unit list
+  lineinfile: dest=/usr/local/etc/trusted_units
+              state=absent
+              line="mailsync@{{ user.name }}.timer"
+  when: mail.sync_on == "all"
+  tags:
+    - mailsync
+
+- name: Disable mailsync timer
+  service: name="mailsync@{{ user.name }}.timer" enabled=no
+  when: mail.sync_on == "trusted"
+  tags:
+    - mailsync
+
 - name: Add mailsync to trusted unit list
   lineinfile: dest=/usr/local/etc/trusted_units
               state=present
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index 9c1a44f..4b1d9b4 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -17,6 +17,10 @@
   service: name=sshd.socket enabled=yes state=started
   when: ssh.enable_sshd == True
 
+- name: Disable and stop OpenSSH
+  service: name=sshd.socket enabled=no state=stopped
+  when: ssh.enable_sshd == False
+
 - name: Install sshfs
   pacman: name=sshfs state=present
 
diff --git a/roles/tarsnap/tasks/main.yml b/roles/tarsnap/tasks/main.yml
index 93c11e1..594023c 100644
--- a/roles/tarsnap/tasks/main.yml
+++ b/roles/tarsnap/tasks/main.yml
@@ -39,7 +39,17 @@
   service: name=tarsnapper.timer enabled=yes state=started
   when: tarsnapper.timer.run_on == "all"
 
-- name: Add tarsnapper to trusted unit list
+- name: Remove Tarsnapper from trusted unit list
+  lineinfile: dest=/usr/local/etc/trusted_units
+              state=absent
+              line=tarsnapper.timer
+  when: tarsnapper.timer.run_on == "all"
+
+- name: Disable Tarsnapper timer
+  service: name=tarsnapper.timer enabled=no
+  when: tarsnapper.timer.run_on == "trusted"
+
+- name: Add Tarsnapper to trusted unit list
   lineinfile: dest=/usr/local/etc/trusted_units
               state=present
               line=tarsnapper.timer