/etc/iiab/iiab.ini: install / enabled -> ROLE_install / ROLE_enabled

roles/network/tasks/dansguardian.yml

@@ -48,6 +48,13 @@
     state: directory
   when: ansible_distribution == "CentOS"
 
+
+# RECORD DansGuardian AS INSTALLED
+
+- name: "Set 'dansguardian_installed: True'"
+  set_fact:
+    dansguardian_installed: True
+
 - name: "Add 'dansguardian_installed: True' to {{ iiab_state_file }}"
   lineinfile:
     path: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml

roles/network/tasks/squid.yml

@@ -77,15 +77,24 @@
     mode: '0750'
     state: directory
 
+
 - include_tasks: roles/network/tasks/dansguardian.yml
   when: dansguardian_install
 
+
+# RECORD Squid AS INSTALLED
+
+- name: "Set 'squid_installed: True'"
+  set_fact:
+    squid_installed: True
+
 - name: "Add 'squid_installed: True' to {{ iiab_state_file }}"
   lineinfile:
     path: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^squid_installed'
     line: 'squid_installed: True'
 
+
 # {{ proxy }} is normally "squid", but is "squid3" on raspbian-8 & debian-8
 - name: Add '{{ proxy }}' variable values to {{ iiab_ini_file }}
   ini_file:
@@ -98,7 +107,9 @@
       value: Squid
     - option: description
       value: '"Squid caches web pages the first time they are accessed, and pulls them from the cache thereafter."'
-    - option: enabled
+    - option: squid_install
+      value: "{{ squid_install }}"
+    - option: squid_enabled
       value: "{{ squid_enabled }}"
 
 - name: Add 'dansguardian' variable values to {{ iiab_ini_file }}
@@ -112,5 +123,7 @@
       value: DansGuardian
     - option: description
       value: '"DansGuardian searches web content for objectionable references and denies access when found."'
-    - option: enabled
+    - option: dansguardian_install
+      value: "{{ dansguardian_install }}"
+    - option: dansguardian_enabled
       value: "{{ dansguardian_enabled }}"

roles/network/tasks/wondershaper.yml

@@ -38,12 +38,20 @@
     # group: root
     state: link
 
+
+# RECORD Wondershaper AS INSTALLED
+
+- name: "Set 'wondershaper_installed: True'"
+  set_fact:
+    wondershaper_installed: True
+
 - name: "Add 'wondershaper_installed: True' to {{ iiab_state_file }}"
   lineinfile:
     path: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^wondershaper_installed'
     line: 'wondershaper_installed: True'
 
+
 - name: Add 'wondershaper' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
@@ -55,5 +63,7 @@
       value: wondershaper
     - option: description
       value: '"Wondershaper is a command line tool to set maximum transfer rates for network adapters."'
-    - option: enabled
+    - option: wondershaper_install
+      value: "{{ wondershaper_install }}"
+    - option: wondershaper_enabled
       value: "{{ wondershaper_enabled }}"