/etc/iiab/iiab.ini -> {{ iiab_ini_file }}

roles/0-init/tasks/iiab_ini.yml

@@ -1,5 +1,5 @@
 # workaround for fact that auto create does not work on ini_file
-- name: Create /etc/iiab/iiab.ini (iiab_ini_file)
+- name: Create {{ iiab_ini_file }} (iiab_ini_file)
   file:
     dest: "{{ iiab_ini_file }}"
     state: touch
@@ -16,7 +16,7 @@
     - option: iiab_dir
       value: "{{ iiab_dir }}"
 
-- name: Add 'version' variable values to /etc/iiab/iiab.ini
+- name: Add 'version' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: version

roles/0-init/tasks/main.yml

@@ -165,7 +165,7 @@
   include_tasks: hostname.yml
   when: FQDN_changed
 
-- name: Add 'runtime' variable values to /etc/iiab/iiab.ini
+- name: Add 'runtime' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: runtime
@@ -209,7 +209,7 @@
     - option: FQDN_changed
       value:  "{{ FQDN_changed }}"
 
-- name: Add 'runtime' variable 'is_VM' value if defined, to /etc/iiab/iiab.ini
+- name: Add 'runtime' variable 'is_VM' value if defined, to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: runtime

roles/1-prep/templates/iiab-network-reset

@@ -38,8 +38,8 @@ echo "/etc/resolv.conf"
 cat /etc/resolv.conf
 echo
 echo "=========================================================="
-echo "cat /etc/iiab/iiab.ini"
-cat /etc/iiab/iiab.ini
+echo "cat {{ iiab_ini_file }}"
+cat {{ iiab_ini_file }}
 echo
 echo "=========================================================="
 echo "routing table"

roles/awstats/tasks/main.yml

@@ -1,7 +1,7 @@
 - include_tasks: install.yml
   when: awstats_install
 
-- name: Add 'awstats' to list of services at /etc/iiab/iiab.ini
+- name: Add 'awstats' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: awstats

roles/calibre-web/tasks/main.yml

@@ -122,7 +122,7 @@
     name: "{{ apache_service }}"    # httpd or apache2
     state: restarted
 
-- name: Add 'calibre-web' to list of services at /etc/iiab/iiab.ini
+- name: Add 'calibre-web' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: calibre-web

roles/calibre/tasks/main.yml

@@ -132,7 +132,7 @@
     name: "{{ apache_service }}"
     state: reloaded
 
-- name: Add 'calibre' to list of services at /etc/iiab/iiab.ini
+- name: Add 'calibre' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: calibre

roles/cups/tasks/main.yml

@@ -64,7 +64,7 @@
     enabled: no
   when: not cups_enabled and is_F18
 
-- name: Add 'cups' to list of services at /etc/iiab/iiab.ini
+- name: Add 'cups' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: cups

roles/dokuwiki/tasks/main.yml

@@ -2,7 +2,7 @@
   include_tasks: install.yml
   when: dokuwiki_install
 
-- name: Add 'dokuwiki' to list of services at /etc/iiab/iiab.ini
+- name: Add 'dokuwiki' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: dokuwiki

roles/elgg/tasks/main.yml

@@ -138,7 +138,7 @@
     state: absent
   when: not elgg_enabled and is_redhat
 
-- name: Add 'elgg' to list of services at /etc/iiab/iiab.ini
+- name: Add 'elgg' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: elgg

roles/httpd/tasks/html.yml

@@ -59,9 +59,9 @@
   with_fileglob:
     - html/services/*
 
-- name: Create symlink from assets to /etc/iiab/iiab.ini
+- name: Create symlink from assets to {{ iiab_ini_file }}
   file:
-    src: "/etc/iiab/iiab.ini"
+    src: "{{ iiab_ini_file }}"
     dest: "{{ doc_root }}/common/assets/iiab.ini"
     owner: root
     group: root

roles/iiab-admin/tasks/main.yml

@@ -7,7 +7,7 @@
   tags:
     - base
 
-- name: Add 'iiab-admin' to list at /etc/iiab/iiab.ini
+- name: Add 'iiab-admin' to list at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: iiab-admin

roles/kalite/tasks/main.yml

@@ -36,7 +36,7 @@
 
 - include_tasks: enable.yml
 
-- name: Add 'kalite' to list of services at /etc/iiab/iiab.ini
+- name: Add 'kalite' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: kalite

roles/kiwix/tasks/kiwix_install.yml

@@ -149,7 +149,7 @@
 
 # 5. FINALIZE
 
-- name: Add 'kiwix' to list of services at /etc/iiab/iiab.ini
+- name: Add 'kiwix' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: kiwix

roles/kiwix/templates/iiab-make-kiwix-lib.py

@@ -30,8 +30,8 @@ from iiab_env import get_iiab_env
 
 # Config Files
 # iiab_ini_file should be in {{ iiab_env_file }}
-iiab_ini_file = "{{ iiab_ini_file }}" # nominally /etc/iiab/iiab.ini
-# iiab_ini_file = "/etc/iiab/iiab.ini" # comment out after testing
+iiab_ini_file = "{{ iiab_ini_file }}" # nominally {{ iiab_ini_file }}
+# iiab_ini_file = "{{ iiab_ini_file }}" # comment out after testing
 
 IIAB_INI = get_iiab_env('IIAB_INI') # future
 if IIAB_INI:

roles/kolibri/tasks/main.yml

@@ -80,7 +80,7 @@
     state: stopped
   when: not kolibri_enabled
 
-- name: Add 'kolibri' to list of services at /etc/iiab/iiab.ini
+- name: Add 'kolibri' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: kolibri

roles/mediawiki/tasks/install.yml

@@ -85,7 +85,7 @@
     name: "{{ apache_service }}"
     state: restarted
 
-- name: Add 'mediawiki' to list of services at /etc/iiab/iiab.ini
+- name: Add 'mediawiki' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: mediawiki

roles/mongodb/tasks/main.yml

@@ -60,7 +60,7 @@
 #    state: stopped
 #  when: not mongodb_enabled
 
-- name: Add 'mongodb' to list of services at /etc/iiab/iiab.ini
+- name: Add 'mongodb' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: mongodb

roles/monit/tasks/main.yml

@@ -45,7 +45,7 @@
 #- name: Restart monit service
 #  command: service monit restart
 
-- name: Add 'monit' to list of services at /etc/iiab/iiab.ini
+- name: Add 'monit' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: monit

roles/moodle/tasks/main.yml

@@ -155,7 +155,7 @@
     path: "{{ moodle_base }}/config.php"
     mode: 0644
 
-- name: Add 'moodle' to list of services at /etc/iiab/iiab.ini
+- name: Add 'moodle' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: moodle

roles/munin/tasks/main.yml

@@ -84,7 +84,7 @@
     - /usr/share/munin/plugins/mysql_threads
   when: mysql_enabled
 
-- name: Add 'munin' to list of services at /etc/iiab/iiab.ini
+- name: Add 'munin' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: munin

roles/mysql/tasks/main.yml

@@ -133,7 +133,7 @@
         state: stopped
       when: not mysql_enabled
 
-    - name: Add 'mysql' to list of services at /etc/iiab/iiab.ini
+    - name: Add 'mysql' to list of services at {{ iiab_ini_file }}
       ini_file:
         dest: "{{ iiab_ini_file }}"
         section: mysql

roles/network/tasks/computed_network.yml

@@ -192,7 +192,7 @@
   tags:
     - network
 
-- name: Add 'computed_network' variable values to /etc/iiab/iiab.ini
+- name: Add 'computed_network' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: computed_network

roles/network/tasks/computed_services.yml

@@ -49,7 +49,7 @@
     dhcp_service2: "dnsmasq disabled"
   when: dnsmasq_install and iiab_network_mode == "Appliance"
 
-- name: Add 'network' variable values (from computed_services.yml) to /etc/iiab/iiab.ini
+- name: Add 'network' variable values (from computed_services.yml) to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: network

roles/network/tasks/detected_network.yml

@@ -188,7 +188,7 @@
     gui_wan_iface: "{{ device_gw }}"
   when: user_wan_iface == "auto" and device_gw != "none" and discovered_wan_iface == "none"
 
-- name: Add 'detected_network' variable values to /etc/iiab/iiab.ini
+- name: Add 'detected_network' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: detected_network

roles/network/tasks/enable_services.yml

@@ -150,7 +150,7 @@
   with_items:
    - { 0: 'gateway/iiab-gen-iptables', 1: '/usr/bin/iiab-gen-iptables' }
 
-- name: Add 'squid' to list of services at /etc/iiab/iiab.ini
+- name: Add 'squid' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: squid
@@ -160,7 +160,7 @@
     - option: enabled
       value: "{{ squid_enabled }}"
 
-- name: Add 'dansguardian' to list of services at /etc/iiab/iiab.ini
+- name: Add 'dansguardian' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: dansguardian
@@ -170,7 +170,7 @@
     - option: enabled
       value: "{{ dansguardian_enabled }}"
 
-- name: Add 'wondershaper' to list of services at /etc/iiab/iiab.ini
+- name: Add 'wondershaper' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: wondershaper

roles/network/tasks/squid.yml

@@ -83,7 +83,7 @@
   when: dansguardian_install
 
 # {{ proxy }} is normally "squid", but is "squid3" on raspbian-8 & debian-8
-- name: Add '{{ proxy }}' to list of services at /etc/iiab/iiab.ini
+- name: Add '{{ proxy }}' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: "{{ proxy }}"
@@ -97,7 +97,7 @@
     - option: enabled
       value: "{{ squid_enabled }}"
 
-- name: Add 'dansguardian' variable values to /etc/iiab/iiab.ini
+- name: Add 'dansguardian' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: dansguardian

roles/network/tasks/wondershaper.yml

@@ -38,7 +38,7 @@
     group: root
     state: link
 
-- name: Add 'wondershaper' variable values to /etc/iiab/iiab.ini
+- name: Add 'wondershaper' variable values to {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: wondershaper

roles/network/templates/gateway/iiab-gen-iptables

@@ -9,7 +9,7 @@ IPTABLES_DATA=/etc/sysconfig/iptables
 {% endif %}
 LANIF=$IIAB_LAN_DEVICE
 WANIF=$IIAB_WAN_DEVICE
-MODE=`grep iiab_network_mode_applied /etc/iiab/iiab.ini | gawk '{print $3}'`
+MODE=`grep iiab_network_mode_applied {{ iiab_ini_file }} | gawk '{print $3}'`
 
 clear_fw() {
 $IPTABLES -F

roles/nextcloud/tasks/main.yml

@@ -162,7 +162,7 @@
 # following enables and disables
 - include_tasks: nextcloud_enabled.yml
 
-- name: Add 'nextcloud' to list of services at /etc/iiab/iiab.ini
+- name: Add 'nextcloud' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: Nextcloud

roles/nodogsplash/tasks/rpi.yml

@@ -52,7 +52,7 @@
     state: stopped
   when: not nodogsplash_enabled
 
-- name: Add 'nodogsplash' to list of services at /etc/iiab/iiab.ini
+- name: Add 'nodogsplash' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: nodogsplash

roles/openvpn/tasks/main.yml

@@ -206,7 +206,7 @@
 #  when: not openvpn_enabled and not installing
 
 
-- name: Add 'openvpn' to list of services at /etc/iiab/iiab.ini
+- name: Add 'openvpn' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: openvpn

roles/openvpn/templates/announcer.j2

@@ -20,9 +20,9 @@ if [ -f /etc/iiab/openvpn_handle ]; then
 #else
 #    # Option #3: Dangerous to invoke hypothetical variables :(
 #    source {{ iiab_env_file }}
-#    # Option #4: CAUSED FAILURES IN AUGUST 2018, invoking stale variable from /etc/iiab/iiab.ini, but safer now that relegated to #4 ?
+#    # Option #4: CAUSED FAILURES IN AUGUST 2018, invoking stale variable from {{ iiab_ini_file }}, but safer now that relegated to #4 ?
 #    if [ -z "$HANDLE" ]; then
-#        HANDLE=`cat /etc/iiab/iiab.ini | gawk \
+#        HANDLE=`cat {{ iiab_ini_file }} | gawk \
 #        '{ if((toupper($1) == "HANDLE") && ($2 == "=")) { print $3;}}'`
 #    fi
 fi

roles/osm/tasks/main.yml

@@ -174,7 +174,7 @@
     name: "{{ apache_service }}"
     state: restarted
 
-- name: Add 'osm' to list of services at /etc/iiab/iiab.ini
+- name: Add 'osm' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: osm

roles/pathagar/tasks/main.yml

@@ -193,7 +193,7 @@
     name: "{{ apache_service }}"
     state: reloaded
 
-- name: Add 'pathagar' to list of services at /etc/iiab/iiab.ini
+- name: Add 'pathagar' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: pathagar

roles/phpmyadmin/tasks/main.yml

@@ -65,7 +65,7 @@
     state: absent
   when: not phpmyadmin_enabled and is_debuntu
 
-- name: Add 'phpmyadmin' to list of services at /etc/iiab/iiab.ini
+- name: Add 'phpmyadmin' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: phpmyadmin

roles/postgresql/tasks/main.yml

@@ -93,7 +93,7 @@
     enabled: no
   when: not postgresql_enabled
 
-- name: Add 'postgresql' to list of services at /etc/iiab/iiab.ini
+- name: Add 'postgresql' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: postgresql

roles/samba/tasks/main.yml

@@ -71,7 +71,7 @@
     - samba
   when : not samba_enabled
 
-- name: Add 'samba' to list of services at /etc/iiab/iiab.ini
+- name: Add 'samba' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: samba

roles/sugarizer/tasks/main.yml

@@ -228,7 +228,7 @@
 #    state: stopped
 #  when: not sugarizer_enabled
 
-- name: Add 'sugarizer' to list of services at /etc/iiab/iiab.ini
+- name: Add 'sugarizer' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: sugarizer

roles/transmission/tasks/main.yml

@@ -54,7 +54,7 @@
     state: stopped
   when: not transmission_enabled
 
-- name: Add transmission to list of services at /etc/iiab/iiab.ini
+- name: Add transmission to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: transmission

roles/vnstat/tasks/main.yml

@@ -29,7 +29,7 @@
     enabled: yes
     state: started
 
-- name: Add 'vnstat' to list of services at /etc/iiab/iiab.ini
+- name: Add 'vnstat' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: vnstat

roles/wordpress/tasks/install.yml

@@ -135,7 +135,7 @@
     name: "{{ apache_service }}"
     state: restarted
 
-- name: Add 'wordpress' to list of services at /etc/iiab/iiab.ini
+- name: Add 'wordpress' to list of services at {{ iiab_ini_file }}
   ini_file:
     dest: "{{ iiab_ini_file }}"
     section: wordpress

vars/default_vars.yml

@@ -9,8 +9,8 @@
 iiab_local_vars_file: /etc/iiab/local_vars.yml
 iiab_env_file: /etc/iiab/iiab.env
 iiab_ini_file: /etc/iiab/iiab.ini
-iiab_config_file: "{{ iiab_ini_file }}"    # Legacy support / let's phase this out eventually
-service_filelist: "{{ iiab_ini_file }}"    # Legacy support / let's phase this out eventually
+#iiab_config_file: "{{ iiab_ini_file }}"    # Legacy support / let's phase this out eventually
+#service_filelist: "{{ iiab_ini_file }}"    # Legacy support / let's phase this out eventually
 
 iiab_base: /opt/iiab
 iiab_dir: "{{ iiab_base }}/iiab"