Merge pull request #2138 from holta/shims

25 of 26 install.yml's + 10 others tasks/*.yml now write to /etc/iiab/iiab_state.yml

roles/awstats/tasks/install.yml

@@ -76,9 +76,8 @@
   shell: /usr/bin/perl /usr/lib/cgi-bin/awstats.pl -config=schoolserver -update
   # when: awstats_enabled | bool
 
-- name: "Add 'awstats_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'awstats_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^awstats_installed'
     line: 'awstats_installed: True'
-    state: present

roles/azuracast/tasks/install.yml

@@ -64,9 +64,8 @@
   args:
     chdir: "{{ azuracast_host_dir }}"
 
-- name: "Add 'azuracast_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'azuracast_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^azuracast_installed'
     line: 'azuracast_installed: True'
-    state: present

roles/bluetooth/tasks/install.yml

@@ -55,9 +55,8 @@
     regexp: '^#DiscoverableTimeout'
     line: 'DiscoverableTimeout = 0'
 
-- name: "Add 'bluetooth_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'bluetooth_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^bluetooth_installed'
     line: 'bluetooth_installed: True'
-    state: present

roles/calibre-web/tasks/install.yml

@@ -102,9 +102,8 @@
   when: not metadatadb.stat.exists
   #when: calibreweb_provision | bool
 
-- name: "Add 'calibreweb_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'calibreweb_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^calibreweb_installed'
     line: 'calibreweb_installed: True'
-    state: present

roles/calibre/tasks/install.yml

@@ -79,9 +79,8 @@
   include_tasks: create-db.yml
   when: not calibre_db.stat.exists
 
-- name: "Add 'calibre_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'calibre_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
-    regexp: '^calibreweb_installed'
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^calibre_installed'
     line: 'calibre_installed: True'
-    state: present

roles/captiveportal/tasks/main.yml

@@ -88,12 +88,11 @@
     state: absent
   when: not captiveportal_enabled
 
-- name: "Add 'captiveportal_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'captiveportal_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^captiveportal_installed'
     line: 'captiveportal_installed: True'
-    state: present
 
 #- name: Restart dnsmasq
 #  systemd:
@@ -114,4 +113,3 @@
     name: dnsmasq
     state: started
   when: dnsmasq_enabled | bool
-  

roles/cups/tasks/main.yml

@@ -7,13 +7,6 @@
   tags:
     - download
 
-- name: "Add 'cups_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
-  lineinfile:
-    dest: "{{ iiab_state_file }}"
-    regexp: '^cups_installed'
-    line: 'cups_installed: True'
-    state: present
-
 - name: Install our own /etc/cups/cupsd.conf from template, to permit local LAN admin
   template:
     src: cupsd.conf
@@ -24,12 +17,15 @@
     src: cups.conf
     dest: "/etc/{{ apache_config_dir }}/"
 
-- name: Create symlink cups.conf from sites-enabled to sites-available (debuntu)
-  file:
-    src: /etc/apache2/sites-available/cups.conf
-    dest: /etc/apache2/sites-enabled/cups.conf
-    state: link
-  when: cups_enabled and is_debuntu
+- name: "Add 'cups_installed: True' to {{ iiab_state_file }}"
+  lineinfile:
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^cups_installed'
+    line: 'cups_installed: True'
+
+- name: Enable http://box/cups via Apache (MIGHT NOT WORK?)
+  command: a2ensite cups.conf
+  when: cups_enabled
 
 - name: Enable & Start services 'cups' and 'cups-browsed' (OS's other than Fedora 18)
   service:

roles/dokuwiki/tasks/install.yml

@@ -47,8 +47,8 @@
 #     state: absent
 #   when: not dokuwiki_enabled and is_debuntu
 
-- name: "Add 'dokuwiki_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'dokuwiki_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^dokuwiki_installed'
     line: 'dokuwiki_installed: True'

roles/elgg/tasks/install.yml

@@ -87,8 +87,8 @@
     src: elgg.conf
     dest: "/etc/{{ apache_config_dir }}/elgg.conf"
 
-- name: "Add 'elgg_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'elgg_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^elgg_installed'
     line: 'elgg_installed: True'

roles/gitea/tasks/install.yml

@@ -124,9 +124,8 @@
     - { src: 'gitea.service.j2', dest: '/etc/systemd/system/gitea.service' }
     - { src: 'gitea.conf.j2', dest: "/etc/{{ apache_config_dir }}/gitea.conf" }
 
-- name: "Add 'gitea_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'gitea_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^gitea_installed'
     line: 'gitea_installed: True'
-    state: present

roles/httpd/tasks/install.yml

@@ -107,9 +107,9 @@
 - name: Create Apache's pid dir /var/run/{{ apache_user }}
   file:
     path: "/var/run/{{ apache_user }}"
-    mode: 0755
     owner: root
     group: root
+    mode: '0755'
     state: directory
 
 - name: 'Create group: admin'
@@ -127,9 +127,9 @@
 - name: Create Apache dir /var/log/{{ apache_service }}
   file:
     path: "/var/log/{{ apache_service }}"
-    mode: 0755
     owner: "{{ apache_user }}"
     group: "{{ apache_user }}"
+    mode: '0755'
     state: directory
 
 - name: Enable Apache systemd service ({{ apache_service }})
@@ -141,7 +141,13 @@
 - name: Create /library/www/html/info directory for http://box/info offline docs
   file:
     path: "{{ doc_root }}/info"
-    mode: 0755
     owner: "{{ apache_user }}"
     group: "{{ apache_user }}"
+    mode: '0755'
     state: directory
+
+- name: "Add 'apache_installed: True' to {{ iiab_state_file }}"
+  lineinfile:
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^apache_installed'
+    line: 'apache_installed: True'

roles/internetarchive/tasks/install.yml

@@ -45,9 +45,8 @@
     - { src: 'internetarchive.service.j2', dest: '/etc/systemd/system/internetarchive.service' }
     - { src: 'internetarchive.conf', dest: '/etc/apache2/sites-available/internetarchive.conf' }
 
-- name: "Add 'internetarchive_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'internetarchive_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^internetarchive_installed'
     line: 'internetarchive_installed: True'
-    state: present

roles/kalite/tasks/install.yml

@@ -81,3 +81,10 @@
     path: /usr/local/kalite/venv/local/lib/python2.7/site-packages/kalite/packages/dist/ifcfg/parser.py
     regexp: 'a-zA-Z0-9'
     replace: 'a-zA-Z0-9\-'
+
+# SHOULD REALLY BE HERE...but for now this runs in kalite/tasks/setup.yml
+# - name: "Add 'kalite_installed: True' to {{ iiab_state_file }}"
+#   lineinfile:
+#     dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+#     regexp: '^kalite_installed'
+#     line: 'kalite_installed: True'

roles/kalite/tasks/setup.yml

@@ -3,9 +3,9 @@
 - name: Create {{ kalite_root }} directory
   file:
     path: "{{ kalite_root }}/httpsrv/static"    # /library/ka-lite
-    owner: root
-    group: root
-    mode: 0755
+    # owner: root
+    # group: root
+    # mode: 0755
     state: directory
 
 - name: Run the setup using 'kalite manage'
@@ -15,9 +15,9 @@
   async: 1800
   poll: 10
 
-- name: "Add 'kalite_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+# CAN WE MOVE THIS TO THE END OF kalite/tasks/install.yml (HENCE ITS FILENAME!)
+- name: "Add 'kalite_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^kalite_installed'
     line: 'kalite_installed: True'
-    state: present

roles/kiwix/tasks/install.yml

@@ -83,9 +83,8 @@
 
 # 5. RECORD KIWIX AS INSTALLED IN /etc/iiab/iiab_state.yml
 
-- name: "Add 'kiwix_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'kiwix_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^kiwix_installed'
     line: 'kiwix_installed: True'
-    state: present

roles/kolibri/tasks/install.yml

@@ -113,9 +113,8 @@
 #  apache2_module:
 #    name: proxy_http
 
-- name: "Add 'kolibri_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'kolibri_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^kolibri_installed'
     line: 'kolibri_installed: True'
-    state: present

roles/lokole/tasks/install.yml

@@ -86,8 +86,8 @@
 #     state: restarted
 #   when: lokole_enabled | bool
 
-- name: "Add 'lokole_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'lokole_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^lokole_installed'
     line: 'lokole_installed: True'

roles/mediawiki/tasks/install.yml

@@ -85,9 +85,8 @@
 
 # Install {{ nginx_config_dir }}/mediawiki-nginx.conf from template in enable.yml
 
-- name: "Add 'mediawiki_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'mediawiki_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^mediawiki_installed'
     line: 'mediawiki_installed: True'
-    state: present

roles/minetest/tasks/provision.yml

@@ -9,12 +9,10 @@
 - name: Create /library/games
   file:
     state: directory
-    path: "{{ item }}"
-    owner: root
-    group: root
-    mode: 0755
-  with_items:
-    - /library/games
+    path: /library/games
+    # owner: root
+    # group: root
+    # mode: 0755
 
 # rpi only
 - include_tasks: rpi_minetest_install.yml
@@ -37,7 +35,7 @@
     recurse: yes
     owner: "{{ minetest_runas_user }}"
     group: "{{ minetest_runas_group }}"
-    mode: 0755
+    # mode: 0755
   when: minetest_default_game == "carbone-ng"
 
 # Install games
@@ -71,10 +69,8 @@
     path: "{{ minetest_game_dir }}/mods/name_restrictions"
   when: minetest_default_game == "carbone-ng"
 
-- name: "Add 'minetest_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'minetest_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^minetest_installed'
     line: 'minetest_installed: True'
-    state: present
-

roles/mongodb/tasks/install.yml

@@ -128,9 +128,8 @@
     - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service', mode: '0644' }
     - { src: 'iiab-mongodb-repair-if-no-lock.j2', dest: '/usr/bin/iiab-mongodb-repair-if-no-lock', mode: '0755' }
 
-- name: "Add 'mongodb_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'mongodb_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^mongodb_installed'
     line: 'mongodb_installed: True'
-    state: present

roles/monit/tasks/install.yml

@@ -57,3 +57,9 @@
       value: '"Monit is a background service monitor which can correct problems, send email, restart services."'
     - option: enabled
       value: "{{ monit_enabled }}"
+
+- name: "Add 'monit_installed: True' to {{ iiab_state_file }}"
+  lineinfile:
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^monit_installed'
+    line: 'monit_installed: True'

roles/moodle/tasks/install.yml

@@ -138,8 +138,8 @@
     path: "{{ moodle_base }}/config.php"
     mode: '0644'
 
-- name: "Add 'moodle_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'moodle_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^moodle_installed'
     line: 'moodle_installed: True'

roles/mosquitto/tasks/install.yml

@@ -30,9 +30,8 @@
     group: root
     mode: 0755
 
-- name: "Add 'mosquitto_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'mosquitto_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^mosquitto_installed'
     line: 'mosquitto_installed: True'
-    state: present

roles/munin/tasks/install.yml

@@ -40,9 +40,8 @@
     create: yes
     state: present
 
-- name: "Add 'munin_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'munin_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^munin_installed'
     line: 'munin_installed: True'
-    state: present

roles/network/tasks/dansguardian.yml

@@ -11,7 +11,7 @@
     dest: /etc/dansguardian/dansguardian.conf
     owner: dansguardian
     group: dansguardian
-    mode: 0640
+    mode: '0640'
   when: ansible_distribution == "Fedora"
 
 - name: Install /etc/dansguardian/dansguardian.conf from template (debuntu)
@@ -20,7 +20,7 @@
     dest: /etc/dansguardian/dansguardian.conf
     owner: dansguardian
     group: dansguardian
-    mode: 0640
+    mode: '0640'
   when: is_debuntu | bool
 
 - name: Install /etc/dansguardian/dansguardian.conf from template (CentOS)
@@ -29,7 +29,7 @@
     dest: /etc/dansguardian/dansguardian.conf
     owner: dansguardian
     group: vscan
-    mode: 0640
+    mode: '0640'
   when: ansible_distribution == "CentOS"
 
 - name: Create directory /var/log/dansguardian (OS's other than CentOS)
@@ -37,7 +37,7 @@
     path: /var/log/dansguardian
     owner: dansguardian
     group: dansguardian
-    mode: 0750
+    mode: '0750'
     state: directory
   when: ansible_distribution != "CentOS"
 
@@ -46,13 +46,12 @@
     path: /var/log/dansguardian
     owner: dansguardian
     group: vscan
-    mode: 0750
+    mode: '0750'
     state: directory
   when: ansible_distribution == "CentOS"
 
-- name: "Add 'dansguardian_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'dansguardian_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^dansguardian_installed'
     line: 'dansguardian_installed: True'
-    state: present

roles/network/tasks/dhcpd.yml

@@ -3,16 +3,12 @@
     name: isc-dhcp-server
     state: present
   when: is_debuntu | bool
-  tags:
-    - download
 
 - name: Install dhcp package (not debuntu)
   package:
     name: dhcp
     state: present
   when: not is_debuntu
-  tags:
-    - download
 
 - name: Create non-privileged user 'dhcpd' (debuntu)
   user:
@@ -37,13 +33,11 @@
 
 - name: Install systemd unit file to /etc/systemd/system/dhcpd.service
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: root
-    group: root
-    mode: "{{ item.mode }}"
-  with_items:
-   - { src: 'roles/network/templates/dhcp/dhcpd.service', dest: '/etc/systemd/system/dhcpd.service', mode: '0644' }
+    src: roles/network/templates/dhcp/dhcpd.service
+    dest: /etc/systemd/system/dhcpd.service
+    # owner: root
+    # group: root
+    # mode: '0644'
 
 - name: Create file /var/lib/dhcpd/dhcpd.leases (redhat)
   command: touch /var/lib/dhcpd/dhcpd.leases
@@ -56,13 +50,12 @@
     path: /var/lib/dhcpd/dhcpd.leases
     owner: dhcpd
     group: dhcpd
-    mode: 0644
-    state: file
+    mode: '0644'
+    # state: file
   when: is_redhat | bool
 
-- name: "Add 'dhcpd_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'dhcpd_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^dhcpd_installed'
     line: 'dhcpd_installed: True'
-    state: present

roles/network/tasks/named.yml

@@ -5,8 +5,6 @@
       - bind9utils
     state: present
   when: is_debuntu | bool
-  tags:
-    - download
 
 - name: "Install named packages: bind, bind-utils (OS's other than debuntu)"
   package:
@@ -15,8 +13,6 @@
       - bind-utils
     state: present
   when: not is_debuntu
-  tags:
-    - download
 
 # or we have to change the serial number in the config files.
 - name: Stop named before copying files (if first_run and debuntu)
@@ -30,7 +26,7 @@
     path: "{{ item }}"
     owner: "{{ dns_user }}"
     group: root
-    mode: 0755
+    mode: '0755'
     state: directory
   with_items:
     - /var/named-iiab
@@ -72,7 +68,7 @@
   template:
     src: "roles/network/templates/named/{{ dns_service }}.service"
     dest: "/etc/systemd/system/{{ dns_service }}.service"
-    mode: 0644
+    mode: '0644'
 
 - name: "Install /etc/{{ apache_config_dir }}/dns-jail.conf from template: dns-jail redirect requires the named.blackhole, disabling recursion (if dns_jail_enabled)"
 #        in named-iiab.conf, and the redirection of 404 error documents to /
@@ -81,31 +77,19 @@
     dest: "/etc/{{ apache_config_dir }}/"
   when: dns_jail_enabled | bool
 
-- name: Create symlink dns-jail.conf from sites-enabled to sites-available (if debuntu and dns_jail_enabled)
-  file:
-    src: "/etc/{{ apache_config_dir }}/dns-jail.conf"
-    path: "/etc/{{ apache_service }}/sites-enabled/dns-jail.conf"
-    state: link
-  when: is_debuntu and dns_jail_enabled
-
-- name: Remove symlink /etc/{{ apache_service }}/sites-enabled/dns-jail.conf (if debuntu and not dns_jail_enabled)
-  file: 
-    path: "/etc/{{ apache_service }}/sites-enabled/dns-jail.conf"
-    state: absent
-  when: is_debuntu and not dns_jail_enabled
-
-- name: Remove symlink /etc/{{ apache_config_dir }}/dns-jail.conf (if not debuntu and not dns_jail_enabled)
-  file:
-    path: "/etc/{{ apache_config_dir }}/dns-jail.conf"
-    state: absent
-  when: not is_debuntu and not dns_jail_enabled
-
-- name: "Add 'named_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'named_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^named_installed'
     line: 'named_installed: True'
-    state: present
+
+- name: Enable dns-jail.conf via Apache
+  command: a2ensite dns-jail.conf
+  when: dns_jail_enabled | bool
+
+- name: Disable dns-jail.conf via Apache
+  command: a2dissite: dns-jail.conf
+  when: not dns_jail_enabled
 
 - name: Start named systemd service
   systemd:

roles/network/tasks/squid.yml

@@ -4,8 +4,6 @@
       - "{{ proxy }}"
       - cadaver
     state: present
-  tags:
-    - download
 
 - name: "Bigger hammer for Ubuntu, run: /etc/init.d/squid stop"
   command: /etc/init.d/squid stop
@@ -68,7 +66,7 @@
     path: /library/cache
     owner: "{{ proxy_user }}"
     group: "{{ proxy_user }}"
-    mode: 0750
+    mode: '0750'
     state: directory
 
 - name: Create Squid directory /var/log/{{ proxy }}
@@ -76,18 +74,17 @@
     path: "/var/log/{{ proxy }}"
     owner: "{{ proxy_user }}"
     group: "{{ proxy_user }}"
-    mode: 0750
+    mode: '0750'
     state: directory
 
 - include_tasks: roles/network/tasks/dansguardian.yml
   when: dansguardian_install | bool
 
-- name: "Add 'squid_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'squid_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^squid_installed'
     line: 'squid_installed: True'
-    state: present
 
 # {{ proxy }} is normally "squid", but is "squid3" on raspbian-8 & debian-8
 - name: Add '{{ proxy }}' variable values to {{ iiab_ini_file }}

roles/network/tasks/wondershaper.yml

@@ -3,47 +3,46 @@
     backup: yes
     src: roles/network/templates/wondershaper/wondershaper.service
     dest: /etc/systemd/system/wondershaper.service
-    mode: 0644
+    # mode: '0644'
 
 - name: Install /usr/bin/wondershaper from template
   template:
     backup: yes
     src: roles/network/templates/wondershaper/wondershaper.j2
     dest: /usr/bin/wondershaper
-    owner: root
-    group: root
-    mode: 0744
+    # owner: root
+    # group: root
+    mode: '0744'
 
 - name: Create conf.d directory
   file:
     path: /etc/conf.d
-    owner: root
-    group: root
-    mode: 0755
+    # owner: root
+    # group: root
+    # mode: '0755'
     state: directory
 
 - name: Install /etc/conf.d/wondershaper.conf from template
   template:
     src: roles/network/templates/wondershaper/wondershaper.conf
     dest: /etc/conf.d/wondershaper.conf
-    owner: root
-    group: root
-    mode: 0600
+    # owner: root
+    # group: root
+    mode: '0600'
 
-- name: Create fact (link) for /etc/conf.d/wondershaper.conf
+- name: Create fact (symlink) /etc/ansible/facts.d/wondershaper.fact -> /etc/conf.d/wondershaper.conf
   file:
     src: /etc/conf.d/wondershaper.conf
     dest: /etc/ansible/facts.d/wondershaper.fact
-    owner: root
-    group: root
+    # owner: root
+    # group: root
     state: link
 
-- name: "Add 'wondershaper_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'wondershaper_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^wondershaper_installed'
     line: 'wondershaper_installed: True'
-    state: present
 
 - name: Add 'wondershaper' variable values to {{ iiab_ini_file }}
   ini_file:

roles/nextcloud/tasks/install.yml

@@ -175,8 +175,8 @@
     src: nextcloud.conf.j2
     dest: "/etc/{{ apache_config_dir }}/nextcloud.conf"
 
-- name: "Add 'nextcloud_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'nextcloud_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^nextcloud_installed'
     line: 'nextcloud_installed: True'

roles/nginx/tasks/install.yml

@@ -34,3 +34,9 @@
     path: /var/log/uwsgi/app
     state: directory
     owner: "{{ apache_user }}"
+
+- name: "Add 'nginx_installed: True' to {{ iiab_state_file }}"
+  lineinfile:
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^nginx_installed'
+    line: 'nginx_installed: True'

roles/nginx/tasks/main.yml

@@ -35,7 +35,7 @@
 #  include_tasks: only_nginx.yml
 #  when: nginx_enabled | bool
 
-- name: Stop and disable NGINX, when not nginx_enabled
+- name: Stop & Disable 'nginx' systemd service, when not nginx_enabled
   systemd:
     name: nginx
     state: stopped

roles/nodered/tasks/install.yml

@@ -93,8 +93,8 @@
     state: present
     name: proxy_wstunnel
 
-- name: "Add 'nodered_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'nodered_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^nodered_installed'
     line: 'nodered_installed: True'

roles/samba/tasks/main.yml

@@ -30,12 +30,11 @@
     src: smb.conf.j2
     dest: /etc/samba/smb.conf
 
-- name: "Add 'samba_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'samba_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^samba_installed'
     line: 'samba_installed: True'
-    state: present
 
 - name: Enable & Start Samba systemd service
   service:

roles/sugarizer/tasks/install.yml

@@ -215,9 +215,8 @@
 #    # Use this instead, if tabs are truly nec:
 #    # block: "\tvar pathPrefix = '/sugarizer';\n\tapp.use(pathPrefix, require('path-prefix-proxy')(pathPrefix));"
 
-- name: "Add 'sugarizer_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'sugarizer_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^sugarizer_installed'
     line: 'sugarizer_installed: True'
-    state: present

roles/teamviewer/tasks/install.yml

@@ -49,3 +49,9 @@
   with_items:
     - teamviewer*
   when: teamviewer_install and xo_model == "none" and ansible_distribution_version >= "22"
+
+- name: "Add 'teamviewer_installed: True' to {{ iiab_state_file }}"
+  lineinfile:
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^teamviewer_installed'
+    line: 'teamviewer_installed: True'

roles/wordpress/tasks/install.yml

@@ -90,9 +90,8 @@
     dest: "/etc/{{ apache_config_dir }}/wordpress.conf"
   when: apache_enabled | bool
 
-- name: "Add 'wordpress_installed: True' to {{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+- name: "Add 'wordpress_installed: True' to {{ iiab_state_file }}"
   lineinfile:
-    dest: "{{ iiab_state_file }}"
+    dest: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
     regexp: '^wordpress_installed'
     line: 'wordpress_installed: True'
-    state: present