merge iiab-install

iiab-install

@@ -0,0 +1,74 @@
+#!/bin/bash -e
+# running from a git repo
+PLAYBOOK="iiab-stages.yml"
+INVENTORY="ansible_hosts"
+CWD=`pwd`
+# Add cmdline options for passing to ansible
+# todo add proper shift to gobble up --debug --reinstall
+ARGS=""
+
+export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
+
+if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then
+    mkdir -p /etc/ansible/facts.d
+fi
+cp ./scripts/local_facts.fact /etc/ansible/facts.d/local_facts.fact
+
+STAGE=""
+
+if [ ! -f /etc/iiab/iiab.env ]; then
+    mkdir -p /etc/iiab
+else
+    OLD=`grep XSCE /etc/iiab/iiab.env | wc -l`
+    if [ "$OLD" != 0 ] || [ "$1" = "--reinstall" ]; then
+        echo "Found old XSCE install - re-installing from scratch"
+        rm /etc/iiab/iiab.env
+        # check ansible version here and force ansible upgrade if needed
+    else
+        source /etc/iiab/iiab.env
+        if [ $STAGE == 9 ] && [ "$1" = "--debug" ]; then
+            echo "Entering debug mode"
+            sed -i -e 's/^STAGE=.*/STAGE=2/' /etc/iiab/iiab.env
+        elif [ ! $STAGE == 9 ]; then
+            echo "Restarting *after* STAGE $STAGE..as soon as Stage 0 completes. Stage 9 comes last."
+        else
+            # place keeper add read response
+            # "offer 'Y' or stage number dialog box option to override"
+            echo "'iiab-install' has already been completed"
+            echo "use --debug to override "
+            #echo "In demo mode not preventing second run"
+            echo "Exiting."
+            exit 1
+        fi
+    fi
+fi
+
+if [ ! -f $PLAYBOOK ]; then
+    echo "IIAB Playbook not found."
+    echo "Please run this command from the top level of the git repo."
+    echo "Exiting."
+    exit 1
+fi
+
+# if vars/local_vars.yml is missing, put a default one in place - First Run
+if [ ! -f ./vars/local_vars.yml ]; then
+    OS=`grep ^ID= /etc/*release|cut -d= -f2`
+    OS=${OS//\"/}
+
+    case $OS in
+        OLPC | fedora)
+        cp ./vars/olpc.localvars ./vars/local_vars.yml
+        ;;
+        centos | debian | ubuntu | raspbian)
+        cp ./vars/medium.localvars ./vars/local_vars.yml
+        ;;
+        *)
+        echo "IIAB supports raspbian, debian, ubuntu, centos, and OLPC - exiting now..."
+        exit 1
+        ;;
+    esac
+fi
+
+echo "Running local playbooks! "
+ansible -m setup -i $INVENTORY localhost --connection=local >> /dev/null
+ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --connection=local

iiab-network

@@ -1,15 +1,8 @@
 #!/bin/bash
-
+# running from a git repo
-if [ -f /etc/iiab/iiab.env ]
+# ansible files exist
-then
-  . /etc/iiab/iiab.env
-  cd $IIAB_DIR
-else
-  echo /etc/iiab/iiab.env is missing. Playbook has not been run.
-  exit 1
-fi
-
 CWD=`pwd`
+export ANSIBLE_LOG_PATH="$CWD/iiab-network.log"
 
 if [ ! -f iiab-network.yml ]
 then
@@ -25,7 +18,6 @@ then
 fi
 
 Start=`date`
-export ANSIBLE_LOG_PATH="$XSCE_DIR/iiab-network.log"
 ansible-playbook -i ansible_hosts iiab-network.yml --connection=local
 End=`date`
 echo "" >> iiab-network.log

iiab-stages.yml

@@ -0,0 +1,69 @@
+---
+- hosts: all
+  become: yes
+
+  vars_files:
+  - vars/default_vars.yml
+  - vars/{{ ansible_local.local_facts.os_ver }}.yml
+  - vars/local_vars.yml
+
+  tasks:
+
+  - name: 0-init
+    include_role:
+      name: 0-init
+    tags: 0-init
+
+  - name: 1-prep
+    include_role:
+      name: 1-prep
+    when: ansible_local.local_facts.stage|int < 1
+    tags: 1-prep, platform, base
+
+  - name: 2-common
+    include_role:
+      name: 2-common
+    when: ansible_local.local_facts.stage|int < 2
+    tags: 2-common, base
+
+  - name: 3-base-server
+    include_role:
+      name: 3-base-server
+    when: ansible_local.local_facts.stage|int < 3
+    tags: 3-base-server, base
+
+  - name: 4-server-options
+    include_role:
+      name: 4-server-options
+    when: ansible_local.local_facts.stage|int < 4
+    tags: 4-server-options
+
+  - name: 5-xo-services
+    include_role:
+      name: 5-xo-services
+    when: ansible_local.local_facts.stage|int < 5
+    tags: 5-xo-services
+
+  - name: 6-generic-apps
+    include_role:
+      name: 6-generic-apps
+    when: ansible_local.local_facts.stage|int < 6
+    tags: 6-generic-apps
+
+  - name: 7-edu-apps
+    include_role:
+      name: 7-edu-apps
+    when: ansible_local.local_facts.stage|int < 7
+    tags: 7-edu-apps
+
+  - name: 8-mgmt-tools
+    include_role:
+      name: 8-mgmt-tools
+    when: ansible_local.local_facts.stage|int < 8
+    tags: 8-mgmt-tools
+
+  - name: 9-local-addons
+    include_role:
+      name: 9-local-addons
+    when: ansible_local.local_facts.stage|int < 9
+    tags: 9-local-addons

install-support

@@ -4,6 +4,8 @@ PLAYBOOK="iiab-base.yml"
 INVENTORY="ansible_hosts"
 CWD=`pwd`
 
+export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
+
 if [ ! -f $PLAYBOOK ]
 then
  echo "IIAB Playbook not found."
@@ -15,5 +17,4 @@ fi
 sed -i -e "s/openvpn_install: False/openvpn_install: True/" vars/local_vars.yml
 sed -i -e "s/openvpn_enabled: False/openvpn_enabled: True/" vars/local_vars.yml
 
-export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"
 ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local

roles/0-init/tasks/main.yml

@@ -1,7 +1,7 @@
 # Initialize
 
 - name: ...IS BEGINNING ============================================
-  command: echo
+  include_vars: roles/1-prep/defaults/main.yml
 
 - name: Determine if runansible was run
   stat: path=/etc/iiab/iiab.env
@@ -14,10 +14,10 @@
 
 # we need to inialize the ini file and only write the location and version sections once and only
 # once to preserve the install date and git hash.
-- include: roles/1-prep/tasks/iiab_ini.yml
+- include_tasks: roles/1-prep/tasks/iiab_ini.yml
   when: first_run
 # Now load the computed vars
-- include: roles/1-prep/tasks/computed_vars.yml
+- include_tasks: roles/1-prep/tasks/computed_vars.yml
 
 - name: ...HAS COMPLETED ===========================================
   command: echo

roles/1-prep/tasks/computed_vars.yml

@@ -1,34 +1,54 @@
-# get local vars from scripts in /etc/ansible/facts.d
+- name: re-read local_facts.facts from /etc/ansible/facts.d
-# on first run, this will generate UUID
-
-- name: re-read facts
   setup: filter=ansible_local
 
 # set top level variables from local facts for convenience
 - set_fact:
-     xo_model: '{{ ansible_local["local_facts"]["xo_model"] }}'
+      xo_model: '{{ ansible_local.local_facts.xo_model }}'
-     phplib_dir: '{{ ansible_local["local_facts"]["phplib_dir"] }}'
+      phplib_dir: '{{ ansible_local.local_facts.phplib_dir }}'
+      iiab_stage: '{{ ansible_local.local_facts.stage }}'
+
+# Networking uses a different file for the rpi
+- name: Discover if this is a rpi -- assume if so it is running raspbian
+  set_fact:
+      rpi_model: "rpi"
+      is_rpi: "True"
+  when: ansible_local.local_facts.os == "raspbian"
 
 - name: Set exFAT enabled for XO laptops
   set_fact:
      exFAT_enabled: True
   when: xo_model != "none"
 
+- name: set FQDN
+  set_fact:
+      iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}"
+      FQDN_changed: False
+
+- name: FQDN changed
+  set_fact:
+      FQDN_changed: True
+  when: iiab_fqdn != ansible_fqdn
+
+- name: Now check FQDN
+  include_tasks: roles/2-common/tasks/hostname.yml
+  when: FQDN_changed
+
 # Discover  do we have a gateway? -- if ansible detects gateway, becomes WAN candidate
 - name: Finding gateway
   set_fact:
-    discovered_wan_iface: "{{ ansible_default_ipv4.alias }}"
+      discovered_wan_iface: "{{ ansible_default_ipv4.alias }}"
-  when: 'ansible_default_ipv4.gateway is defined'
+      iiab_wan_iface: "{{ discovered_wan_iface }}"
+  when: ansible_default_ipv4.gateway is defined
 
 - name: Verify gateway present
-  shell: ping -c4 "{{ ansible_default_ipv4.gateway }}" &> /dev/null ; echo $?
+  shell: ping -c4 "{{ ansible_default_ipv4.gateway }}" | grep icmp_seq=4 | wc -l
   when: discovered_wan_iface != "none"
   register: gw_active_test
 
 - name: Recording gateway response
   set_fact:
-     gw_active: True
+      gw_active: True
-  when: discovered_wan_iface != "none" and gw_active_test.stdout == "0"
+  when: discovered_wan_iface != "none" and gw_active_test.stdout == "1"
 
 - name: Test for internet access
   get_url: url="{{ iiab_download_url }}/heart-beat.txt" dest=/tmp/heart-beat.txt
@@ -39,40 +59,13 @@
 
 - name: Set internet_available true if wget succeeded
   set_fact:
-     internet_available: True
+      internet_available: True
   when: not internet_access_test|failed and not disregard_network
 
 - name: Cleanup internet test file
   file: path=/tmp/heart-beat.txt
         state=absent
 
-- name: add version section
-  ini_file: dest='{{ iiab_config_file }}'
-            section=runtime
-            option='{{ item.option }}'
-            value='{{ item.value }}'
-  with_items:
-    - option: 'runtime_branch'
-      value: '{{ ansible_local["local_facts"]["iiab_branch"] }}'
-    - option: 'runtime_commit'
-      value: '{{ ansible_local["local_facts"]["iiab_commit"] }}'
-    - option: 'runtime_date'
-      value: '{{ ansible_date_time["iso8601"] }}'
-    - option: 'runtime_php'
-      value: '{{ phplib_dir }}'
-    - option: 'kernel'
-      value: '{{ ansible_kernel }}'
-    - option: 'memory_mb'
-      value: '{{ ansible_memtotal_mb }}'
-    - option: 'swap_mb'
-      value: '{{ ansible_swaptotal_mb }}'
-    - option: 'product_id'
-      value: '{{ ansible_product_uuid }}'
-    - option: 'gw_active'
-      value:  '{{ gw_active }}'
-    - option: 'internet_available'
-      value:  '{{ internet_available }}'
-
 # Put all computed vars here so derive properly from any prior var file
 - name: If the TZ is not set in env, set it to UTC
   set_fact: local_tz='UTC'
@@ -176,3 +169,40 @@
   set_fact:
     is_CentOS: True
   when: ansible_distribution == "CentOS"
+
+- name: add version section
+  ini_file: dest='{{ iiab_config_file }}'
+            section=runtime
+            option='{{ item.option }}'
+            value='{{ item.value }}'
+  with_items:
+    - option: 'iiab_stage'
+      value: '{{ iiab_stage }}'
+    - option: 'runtime_php'
+      value: '{{ phplib_dir }}'
+    - option: 'runtime_branch'
+      value: '{{ ansible_local.local_facts.iiab_branch }}'
+    - option: 'runtime_commit'
+      value: '{{ ansible_local.local_facts.iiab_commit }}'
+    - option: 'runtime_date'
+      value: '{{ ansible_date_time.iso8601 }}'
+    - option: 'ansible_version'
+      value: '{{ ansible_local.local_facts.ansible_version }}'
+    - option: 'kernel'
+      value: '{{ ansible_kernel }}'
+    - option: 'memory_mb'
+      value: '{{ ansible_memtotal_mb }}'
+    - option: 'swap_mb'
+      value: '{{ ansible_swaptotal_mb }}'
+    - option: 'product_id'
+      value: '{{ ansible_product_uuid }}'
+    - option: 'gw_active'
+      value:  '{{ gw_active }}'
+    - option: 'internet_available'
+      value:  '{{ internet_available }}'
+    - option: 'first_run'
+      value:  '{{ first_run }}'
+    - option: 'local_tz'
+      value:  '{{ local_tz }}'
+    - option: 'FQDN_changed'
+      value:  '{{ FQDN_changed }}'

roles/1-prep/tasks/iiab_ini.yml

@@ -25,10 +25,10 @@
     - option: 'arch'
       value: '{{ ansible_architecture }}'
     - option: 'iiab_branch'
-      value: '{{ ansible_local["local_facts"]["iiab_branch"] }}'
+      value: '{{ ansible_local.local_facts.iiab_branch }}'
     - option: 'iiab_commit'
-      value: '{{ ansible_local["local_facts"]["iiab_commit"] }}'
+      value: '{{ ansible_local.local_facts.iiab_commit }}'
     - option: 'install_date'
-      value: '{{ ansible_date_time["iso8601"] }}'
+      value: '{{ ansible_date_time.iso8601 }}'
     - option: 'install_xo'
       value: '{{ xo_model }}'

roles/1-prep/tasks/main.yml

@@ -50,43 +50,39 @@
 
 - name: Disable AppArmor -- on by default in Ubuntu
   service: name=apparmor enabled=False state=stopped
-  when: first_run and is_ubuntu
+  when: is_ubuntu
   ignore_errors: true
 
 - name: Disable SELinux on next boot
   selinux: state=disabled
   register: selinux_disabled
-  when: first_run and not is_debuntu
+  when: not is_debuntu
 
 - name: Disable SELinux for this session (if needed)
   command: setenforce Permissive
   when: not is_debuntu and selinux_disabled is defined and selinux_disabled.changed
 
 ##  DISCOVER PLATFORMS ######
-- name: Discover if this is an rpi -- assume it is running Raspbian if so
+- include_tasks: prep.yml
-  set_fact:
-     rpi_model: "rpi"
-     is_rpi: "True"
-  when: ansible_local.local_facts.os == "raspbian"
-  ignore_errors: true
-
-- include: prep.yml
-  when: first_run
 
 # Put conditional actions for hardware platforms here
-- include: raspberry_pi_2.yml
+- include_tasks: raspberry_pi_2.yml
   when: first_run and rpi_model != "none"
 
 - name: Check if the identifier for Intel's NUC6 builtin WiFi is present
   shell: "lsusb | grep 8087:0a2b | wc |awk '{print $1}'"
   register: usb_NUC6
   ignore_errors: true
-  when: first_run
 
 - name: Download the firmware for built-in WiFi on NUC6
   get_url: dest=/lib/firmware
            url={{ iiab_download_url }}/iwlwifi-8000C-13.ucode
-  when: first_run and usb_NUC6.stdout|int > 0
+  when: usb_NUC6.stdout|int > 0
 
-- name: ...HAS COMPLETED ===========================================
+# this script can be sourced to get IIAB location
-  command: echo
+- name: Recording STAGE 1 HAS COMPLETED ============================
+  template: src=roles/1-prep/templates/iiab.env.j2
+            dest=/etc/iiab/iiab.env
+            owner=root
+            group=root
+            mode=0644

roles/1-prep/templates/iiab.env.j2

@@ -1,7 +1,8 @@
-# This is a configuration file for XSCE
+# This is a configuration file for IIAB
 # It can sourced in a shell script or read into an application
 IIAB_BASE_PATH={{ iiab_base }}
 IIAB_DIR={{ iiab_dir }}
 OS={{ ansible_local.local_facts.os }}
 OS_VER={{ ansible_local.local_facts.os_ver }}
 WWWROOT={{ doc_root }}
+STAGE=1

roles/2-common/tasks/hostname.yml

@@ -0,0 +1,11 @@
+- name: turn the crank for systemd
+  shell: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"
+  when: is_debuntu
+
+- name: Configure /etc/sysconfig/network
+  template: src=roles/network/templates/network/sysconfig.network.j2
+            dest=/etc/sysconfig/network
+            owner=root
+            group=root
+            mode=0644
+  when: is_redhat

roles/2-common/tasks/main.yml

@@ -3,22 +3,29 @@
 - name: ...IS BEGINNING ==========================================
   command: echo
 
-#- include: iiab_ini.yml
+#- include_tasks: iiab_ini.yml
 
 # create the directory structure for IIAB
-- include: fl.yml
+- include_tasks: fl.yml
 
-- include: xo.yml
+- include_tasks: xo.yml
   when: xo_model != "none" or osbuilder is defined
 
-- include: centos.yml
+# set FQDN for IIAB
+- include_tasks: hostname.yml
+  tags:
+    - network
+    - domain
+    - hostname
+
+- include_tasks: centos.yml
   when: ansible_distribution == "CentOS"
 
-- include: fedora.yml
+- include_tasks: fedora.yml
   when: ansible_distribution == "Fedora"
 
 # the following installs common packages for both debian and fedora
-- include: packages.yml
+- include_tasks: packages.yml
 
 - sysctl: name=net.ipv4.ip_forward value=1 state=present
 - sysctl: name=net.ipv4.conf.default.rp_filter value=1 state=present
@@ -43,10 +50,13 @@
             mode=0644
             backup=no
 
-- include: net_mods.yml
+- include_tasks: net_mods.yml
   when: not is_debuntu and not is_F18
 
-- include: udev.yml
+- include_tasks: udev.yml
 
-- name: ...HAS COMPLETED =========================================
+- name: Recording STAGE 2 HAS COMPLETED ==========================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+              regexp='^STAGE=*'
+              line='STAGE=2'
+              state=present

roles/3-base-server/tasks/main.yml

@@ -1,5 +1,4 @@
 # Base Server
-
 - name: ...IS BEGINNING =====================================
   command: echo
 
@@ -21,6 +20,30 @@
   # has no "when: XXXXX_install" flag
   tags: base, mysql
 
+- include_tasks: roles/network/tasks/named.yml
+  tags:
+    - named
+    - network
+    - domain
+
+- include_tasks: roles/network/tasks/dhcpd.yml
+  tags:
+    - dhcpd
+    - network
+    - domain
+
+- include_tasks: roles/network/tasks/squid.yml
+  tags:
+    - squid
+    - network
+  when: squid_install
+
+- include_tasks: roles/network/tasks/wondershaper.yml
+  tags:
+    - wondershaper
+    - network
+  when: wondershaper_install
+
 - name: Make sure there is a content directory
   file: dest={{ doc_root }}/local_content
         state=directory
@@ -30,12 +53,8 @@
            state=restarted
   when: not installing
 
-# If we got here we're done
+- name: Record STAGE 3 HAS COMPLETED ========================
-#- name: Record base gui version
+  lineinfile: dest=/etc/iiab/iiab.env
-#  lineinfile: dest=/etc/iiab/iiab.env
+              regexp='^STAGE=*'
-#              regexp='^BASE_VERSION=*'
+              line='STAGE=3'
-#              line='BASE_VERSION="{{ gui_version }}"'
+              state=present
-#              state=present
-
-- name: ...HAS COMPLETED ====================================
-  command: echo

roles/4-server-options/tasks/main.yml

@@ -1,5 +1,4 @@
 # Server Options
-
 - name: ...IS BEGINNING ==================================
   command: echo
 
@@ -57,14 +56,6 @@
   when: usb_lib_install
   tags: usb-lib
 
-# this script can be sourced to get IIAB location
-- name: Create iiab.env file
-  template: src=roles/1-prep/templates/iiab.env.j2
-            dest=/etc/iiab/iiab.env
-            owner=root
-            group=root
-            mode=0644
-
 - name: Put a Python interface to iiab.env
   template: src=roles/1-prep/templates/iiab_env.py.j2
             dest=/etc/iiab/iiab_env.py
@@ -73,5 +64,8 @@
   command: /usr/bin/iiab-refresh-wiki-docs
   when: not nodocs
 
-- name: ...HAS COMPLETED =================================
+- name: Recording STAGE 4 HAS COMPLETED ==================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+              regexp='^STAGE=*'
+              line='STAGE=4'
+              state=present

roles/5-xo-services/tasks/main.yml

@@ -1,5 +1,4 @@
 # XO Services
-
 - name: ...IS BEGINNING =====================================
   command: echo
 
@@ -21,5 +20,8 @@
   when: idmgr_install
   tags: olpc, idmgr
 
-- name: ...HAS COMPLETED ====================================
+- name: Recording STAGE 5 HAS COMPLETED =====================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+             regexp='^STAGE=*'
+              line='STAGE=5'
+              state=present

roles/6-generic-apps/tasks/main.yml

@@ -1,5 +1,4 @@
 # Generic Apps
-
 - name: ...IS BEGINNING ====================================
   command: echo
 
@@ -45,5 +44,8 @@
   when: wordpress_install
   tags: wordpress
 
-- name: ...HAS COMPLETED ===================================
+- name: Recording STAGE 6 HAS COMPLETED ====================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+             regexp='^STAGE=*'
+              line='STAGE=6'
+              state=present

roles/7-edu-apps/tasks/main.yml

@@ -1,5 +1,4 @@
 # Educational Apps
-
 - name: ...IS BEGINNING ========================================
   command: echo
 
@@ -39,5 +38,8 @@
   when: sugarizer_install
   tags: sugarizer
 
-- name: ...HAS COMPLETED =======================================
+- name: Recording STAGE 7 HAS COMPLETED ========================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+             regexp='^STAGE=*'
+              line='STAGE=7'
+              state=present

roles/8-mgmt-tools/tasks/main.yml

@@ -51,5 +51,8 @@
   when: xovis_install and ansible_distribution != "CentOS"
   tags: xovis
 
-- name: ...HAS COMPLETED =====================================
+- name: Recording STAGE 8 HAS COMPLETED ======================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+             regexp='^STAGE=*'
+              line='STAGE=8'
+              state=present

roles/9-local-addons/tasks/main.yml

@@ -3,5 +3,8 @@
 - name: ...IS BEGINNING ====================================
   command: echo
 
-- name: ...HAS COMPLETED ===================================
+- name: Recording STAGE 9 HAS COMPLETED ====================
-  command: echo
+  lineinfile: dest=/etc/iiab/iiab.env
+             regexp='^STAGE=*'
+              line='STAGE=9'
+              state=present

roles/ajenti/tasks/main.yml

@@ -37,7 +37,7 @@
         mode=0744
         state=file
 
-- include: ajenti-wondershaper.yml
+- include_tasks: ajenti-wondershaper.yml
   when: 'iiab_lan_iface != ""'
 
 # handler doesn't fire

roles/awstats/tasks/main.yml

@@ -1,4 +1,4 @@
-- include: install.yml
+- include_tasks: install.yml
   when: awstats_install
 
 - name: Add AWStats to service list

roles/dokuwiki/tasks/main.yml

@@ -1,5 +1,5 @@
 - name: Include the install playbook
-  include: install.yml
+  include_tasks: install.yml
   when: dokuwiki_install
 
 - name: Add DokuWiki to service list

roles/httpd/tasks/main.yml

@@ -142,7 +142,7 @@
         state=absent
   when: is_debuntu
 
-- include: html.yml
+- include_tasks: html.yml
   tags:
     - base
 

roles/iiab-admin/tasks/main.yml

@@ -1,9 +1,9 @@
-- include: admin-user.yml
+- include_tasks: admin-user.yml
   tags:
     - base
   when: not no_admin is defined
 
-- include: access.yml
+- include_tasks: access.yml
   tags:
     - base
 

roles/kalite/tasks/main.yml

@@ -16,23 +16,23 @@
   stat: path="{{ kalite_db_name }}"
   register: kalite_installed
 
-- include: install-f18.yml
+- include_tasks: install-f18.yml
   when: not kalite_installed.stat.exists and is_F18
 
-- include: install.yml
+- include_tasks: install.yml
   when: kalite_installed is defined and not kalite_installed.stat.exists and not is_F18
 
 - name: Ask systemd to reread the unit files
   shell: systemctl daemon-reload
   when: not kalite_installed.stat.exists
 
-- include: setup-f18.yml
+- include_tasks: setup-f18.yml
   when: not kalite_installed.stat.exists and is_F18
 
-- include: setup.yml
+- include_tasks: setup.yml
   when: not kalite_installed.stat.exists and not is_F18
 
-- include: enable.yml
+- include_tasks: enable.yml
 
 - name: Add kalite to service list
   ini_file: dest='{{ service_filelist }}'

roles/kiwix/tasks/main.yml

@@ -20,7 +20,7 @@
   get_url: url="{{ iiab_download_url }}/{{ kiwix_src_file }}"  dest="{{ downloads_dir }}/{{ kiwix_src_file }}"
   when: internet_available
 
-- include: kiwix_install.yml
+- include_tasks: kiwix_install.yml
   when: kiwix_src_file is defined
   tags:
     - kiwix

roles/mysql/tasks/main.yml

@@ -45,12 +45,12 @@
       tags:
         - download
 
-    - include: centos.yml
+    - include_tasks: centos.yml
       when: ansible_distribution == "CentOS"
       tags:
         - download
 
-    - include: fedora.yml
+    - include_tasks: fedora.yml
       when: ansible_distribution == "Fedora"
       tags:
         - download

roles/network/tasks/dansguardian.yml

@@ -7,7 +7,7 @@
     - download
 
 - name: Copy DansGuardian config file
-  template: src=squid/dansguardian.conf.j2
+  template: src=roles/network/templates/squid/dansguardian.conf.j2
             dest=/etc/dansguardian/dansguardian.conf
             owner=dansguardian
             group=dansguardian
@@ -15,7 +15,7 @@
   when: ansible_distribution == "Fedora"
 
 - name: Copy DansGuardian config file
-  template: src=squid/dansguardian.conf.debian.j2
+  template: src=roles/network/templates/squid/dansguardian.conf.debian.j2
             dest=/etc/dansguardian/dansguardian.conf
             owner=dansguardian
             group=dansguardian
@@ -23,7 +23,7 @@
   when: is_debuntu
 
 - name: Copy DansGuardian config file for CentOS
-  template: src=squid/dansguardian.conf.centos.j2
+  template: src=roles/network/templates/squid/dansguardian.conf.centos.j2
             dest=/etc/dansguardian/dansguardian.conf
             owner=dansguardian
             group=vscan

roles/network/tasks/detected_network.yml

@@ -1,33 +1,22 @@
-- name: Checking iiab_domain_name
-  shell: "cat /etc/sysconfig/iiab_domain_name"
-  register: prior_domain
-  when: not first_run
-
-# above always registers
-- name: Checking for prior domain name
-  set_fact:
-    iiab_domain: "{{ prior_domain.stdout }}"
-  when: not first_run and prior_domain.stdout != "lan" and prior_domain.stdout != ""
-
 - name: iiab_wan_device
-  shell: "cat /etc/sysconfig/iiab_wan_device"
+  shell: grep IIAB_WAN_DEVICE /etc/iiab/iiab.env | awk -F "=" '{print $2}'
+  when: iiab_stage|int > 4
   register: prior_gw
-  when: not first_run
 
 - name: Checking for old device gateway interface for device test
   set_fact:
-    device_gw: "{{ prior_gw.stdout }}"
+      device_gw: "{{ prior_gw.stdout }}"
-    device_gw2: "{{ prior_gw.stdout }}"
+      device_gw2: "{{ prior_gw.stdout }}"
-  when: not first_run and prior_gw is defined and prior_gw.stdout != ""
+  when: iiab_stage|int > 4 and prior_gw is defined and prior_gw.stdout != ""
 
 - name: Setting WAN if detected
   set_fact:
-    iiab_wan_iface: "{{ discovered_wan_iface }}"
+      iiab_wan_iface: "{{ discovered_wan_iface }}"
-    device_gw: "{{ discovered_wan_iface }}"
+      device_gw: "{{ discovered_wan_iface }}"
-  when: discovered_wan_iface != "none"
+  when: ansible_default_ipv4.gateway is defined
 
 - name: RedHat network detection
-  include: detected_redhat.yml
+  include_tasks: detected_redhat.yml
   when: is_redhat
 
 - name: check to see if dhcpcd is installed and active - Can Fail

roles/network/tasks/dhcpd.yml

@@ -24,8 +24,7 @@
             group=root
             mode={{ item.mode }}
   with_items:
-   - { src: 'dhcp/dhcpd-iiab.conf.j2', dest: '/etc/dhcpd-iiab.conf', mode: '0644' }
+   - { src: 'roles/network/templates/dhcp/dhcpd.service', dest: '/etc/systemd/system/dhcpd.service', mode: '0644' }
-   - { src: 'dhcp/dhcpd.service', dest: '/etc/systemd/system/dhcpd.service', mode: '0644' }
 
 - name: Create dhcpd needed files
   command: touch /var/lib/dhcpd/dhcpd.leases

roles/network/tasks/enable_services.yml

@@ -23,7 +23,8 @@
             mode={{ item.mode }}
   with_items:
    - { src: 'dhcp/dhcpd-env.j2' , dest: '/etc/sysconfig/dhcpd' , mode: '0644' }
-  when: dhcpd_enabled and dhcpd_install
+   - { src: 'dhcp/dhcpd-iiab.conf.j2', dest: '/etc/dhcpd-iiab.conf', mode: '0644' }
+  when: dhcpd_enabled
 
 - name: Copy named file
   template: src={{ item.src }}
@@ -70,8 +71,10 @@
   when: not dansguardian_enabled and dansguardian_install
 
 - name: Create xs_httpcache flag
-  shell: echo 1 > /etc/sysconfig/xs_httpcache_on
+  lineinfile: dest=/etc/iiab/iiab.env
-         creates=/etc/sysconfig/xs_httpcache_on
+              regexp='^HTTPCACHE_ON=*'
+              line='HTTPCACHE_ON=True'
+              state=present
   when: squid_enabled and squid_install
 
 - name: Enable Squid service
@@ -105,8 +108,10 @@
   when: not squid_enabled and squid_install
 
 - name: Remove xs_httpcache flag
-  file: path=/etc/sysconfig/xs_httpcache_on
+  lineinfile: dest=/etc/iiab/iiab.env
-        state=absent
+              regexp='^HTTPCACHE_ON=*'
+              line='HTTPCACHE_ON=False'
+              state=present
   when: not squid_enabled
 
 - name: Enable Wondershaper service

roles/network/tasks/ifcfg_mods.yml

@@ -43,17 +43,17 @@
   when: (num_lan_interfaces != "0" or iiab_wireless_lan_iface != "none")
 
 ## vars/ users should set user_wan_iface to avoid messy redetect
-- include: redetect.yml
+- include_tasks: redetect.yml
   when: discovered_wan_iface == "none" and user_wan_iface == "auto"
 
 # move gateway if not WAN
 # might have wifi info if wireless is used as uplink.
-- include: edit_ifcfg.yml
+- include_tasks: edit_ifcfg.yml
   when: has_wifi_gw == "none" and has_ifcfg_gw != "none" and has_ifcfg_gw != "/etc/sysconfig/network-scripts/ifcfg-WAN"
 
 # create ifcfg-WAN if missing
 # if we get here we have gateway but no ifcfg file
-- include: create_ifcfg.yml
+- include_tasks: create_ifcfg.yml
   when: iiab_wan_iface != "none" and not has_WAN and has_ifcfg_gw == "none" and xo_model == "none" and not iiab_demo_mode
 
 - name: Configuring LAN interface as iiab_lan_iface
@@ -76,7 +76,7 @@
   tags:
     - network
 
-- include: enable_wan.yml
+- include_tasks: enable_wan.yml
   when: not installing and not iiab_demo_mode
 
 - name: ask systemd to reread the unit files, picks up changes done

roles/network/tasks/main.yml

@@ -1,131 +1,83 @@
-- include: detected_network.yml
+- include_tasks: detected_network.yml
   when: not installing
   tags:
     - network
     - network-discover
 
-- include: computed_network.yml
+- include_tasks: computed_network.yml
   when: not installing
   tags:
     - network
     - network-discover
 
-- name: Set hostname
-  template: dest=/etc/hostname
-            src=network/hostname.j2
-            owner=root
-            mode=0644
-  when: is_debuntu
-  register: hostname_change
-  tags:
-    - network
-    - domain
-
-- name: Configure /etc/sysconfig/network
-  template: src=network/sysconfig.network.j2
-            dest=/etc/sysconfig/network
-            owner=root
-            group=root
-            mode=0644
-  when: is_redhat
-  register: hostname_change
-  tags:
-    - network
-    - domain
-
-- name: Create iiab_domain_name flag
-  template: src=network/{{ item }}.j2
-            dest=/etc/sysconfig/{{ item }}
-            mode=0644
-  with_items:
-    - iiab_domain_name
-  tags:
-    - network
-    - domain
-
 ##### Start static ip address info for first run #####
-#- include: static.yml
+#- include_tasks: static.yml
 #  when: 'iiab_wan_iface != "none" and wan_ip != "dhcp"'
 ##### End static ip address info
 
-- include: hosts.yml
+- include_tasks: hosts.yml
   tags:
     - network
+    - hostname
     - domain
 
-##### end hostname setup
+- include_tasks: iptables.yml
-##### start install portion
-# only needs to be done once
-- include: installing.yml
-  tags:
-    - network
-    - named
-    - dhcpd
-    - dnsmasq
-    - squid
-    - domain
-#  when: hostname_change.changed or installing
-
-
-- include: avahi.yml
   tags:
     - network
 
-#### end install portion
+- include_tasks: avahi.yml
-#### start network layout
-# setting installing would skip configuring network
-# but would configure but not start services
-#- include: computed_network.yml
-#  when: not installing
-#  tags:
-#    - network
-#    - network-discover
-
-- include: computed_services.yml
-  tags:
-    - network
-    - named
-    - dhcpd
-    - dnsmasq
-    - squid
-
-# templates needed from above install section live here
-- include: enable_services.yml
-  tags:
-    - network
-    - named
-    - dhcpd
-    - dnsmasq
-    - squid
-
-- include: hostapd.yml
   tags:
     - network
 
-- include: ifcfg_mods.yml
+- include_tasks: hostapd.yml
-  when: not is_debuntu and not installing
+  tags:
+    - network
+    - AP
+
+
+- include_tasks: ifcfg_mods.yml
   tags:
     - network
 
-- include: debian.yml
+- include_tasks: debian.yml
-  when: is_debuntu and not installing
   tags:
     - network
+  when: is_debuntu and not is_rpi  and not installing
 
-- name: Create IIAB network flags
+- include_tasks: rpi_debian.yml
-  template: src=network/{{ item }}.j2
+  tags:
-            dest=/etc/sysconfig/{{ item }}
+    - network
-            mode=0644
+  when: is_debuntu and is_rpi  and not installing
-  with_items:
+
-    - iiab_wan_device
+- name: Record iiab_wan_device
-    - iiab_lan_device
+  lineinfile: dest=/etc/iiab/iiab.env
+              regexp='^IIAB_WAN_DEVICE=*'
+              line='IIAB_WAN_DEVICE="{{ iiab_wan_iface }}"'
+              state=present
   when: not installing
   tags:
     - network
+
+- name: Record iiab_lan_device
+  lineinfile: dest=/etc/iiab/iiab.env
+              regexp='^IIAB_LAN_DEVICE=*'
+              line='IIAB_LAN_DEVICE="{{ iiab_lan_iface }}"'
+              state=present
+  when: not installing
+  tags:
+    - network
+
 #### end network layout
 #### start services
+- include_tasks: computed_services.yml
+  tags:
+    - network
 
-- include: restart.yml
+- include_tasks: enable_services.yml
+  tags:
+    - network
+
+- include_tasks: restart.yml
   when: not installing
   tags:
     - network

roles/network/tasks/named.yml

@@ -41,37 +41,37 @@
             group=root
             mode={{ item.mode }}
   with_items:
-    - { src: 'named/named-iiab.conf.j2', dest: '/etc/named-iiab.conf', owner: "root" , mode: '0644' }
+    - { src: 'roles/network/templates/named/named-iiab.conf.j2', dest: '/etc/named-iiab.conf', owner: "root" , mode: '0644' }
-    - { src: 'named/named.j2', dest: '/etc/sysconfig/named', owner: "root" , mode: '0644' }
+    - { src: 'roles/network/templates/named/named.j2', dest: '/etc/sysconfig/named', owner: "root" , mode: '0644' }
-    - { src: 'named/named', dest: '/etc/sysconfig/olpc-scripts/domain_config.d/named', owner: "root" , mode: '0644' }
+    - { src: 'roles/network/templates/named/named', dest: '/etc/sysconfig/olpc-scripts/domain_config.d/named', owner: "root" , mode: '0644' }
-    - { src: 'named/localdomain.zone', dest: '/var/named-iiab/localdomain.zone',owner: "{{ dns_user }}" , mode: '0644' }
+    - { src: 'roles/network/templates/named/localdomain.zone', dest: '/var/named-iiab/localdomain.zone',owner: "{{ dns_user }}" , mode: '0644' }
-    - { src: 'named/localhost.zone', dest: '/var/named-iiab/localhost.zone', owner: "{{ dns_user }}" , mode: '0644' }
+    - { src: 'roles/network/templates/named/localhost.zone', dest: '/var/named-iiab/localhost.zone', owner: "{{ dns_user }}" , mode: '0644' }
-    - { src: 'named/named.broadcast', dest: '/var/named-iiab/named.broadcast', owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.broadcast', dest: '/var/named-iiab/named.broadcast', owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/named.ip6.local', dest: '/var/named-iiab/named.ip6.local' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.ip6.local', dest: '/var/named-iiab/named.ip6.local' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/named.local', dest: '/var/named-iiab/named.local' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.local', dest: '/var/named-iiab/named.local' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/named.rfc1912.zones', dest: '/var/named-iiab/named.rfc1912.zones' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.rfc1912.zones', dest: '/var/named-iiab/named.rfc1912.zones' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/named.root', dest: '/var/named-iiab/named.root' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.root', dest: '/var/named-iiab/named.root' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/named.root.hints', dest: '/var/named-iiab/named.root.hints' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.root.hints', dest: '/var/named-iiab/named.root.hints' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/named.zero', dest: '/var/named-iiab/named.zero' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.zero', dest: '/var/named-iiab/named.zero' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/school.external.zone.db', dest: '/var/named-iiab/school.external.zone.db' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/school.external.zone.db', dest: '/var/named-iiab/school.external.zone.db' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/school.internal.zone.16.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.16.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/school.internal.zone.16.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.16.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/school.internal.zone.32.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.32.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/school.internal.zone.32.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.32.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/school.internal.zone.48.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.48.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/school.internal.zone.48.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.48.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
 # the following two files are not writeable by named, but bind 9.4 cannot discover that fact correctly
-    - { src: 'named/school.internal.zone.db', dest: '/var/named-iiab/school.internal.zone.db' , owner: "root" , mode: '0644'}
+    - { src: 'roles/network/templates/named/school.internal.zone.db', dest: '/var/named-iiab/school.internal.zone.db' , owner: "root" , mode: '0644'}
-    - { src: 'named/school.local.zone.db', dest: '/var/named-iiab/school.local.zone.db' , owner: "root" , mode: '0644'}
+    - { src: 'roles/network/templates/named/school.local.zone.db', dest: '/var/named-iiab/school.local.zone.db' , owner: "root" , mode: '0644'}
-    - { src: 'named/school.internal.zone.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/school.internal.zone.in-addr.db.j2', dest: '/var/named-iiab/school.internal.zone.in-addr.db' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/dummy', dest: '/var/named-iiab/data/dummy' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/dummy', dest: '/var/named-iiab/data/dummy' , owner: "{{ dns_user }}" , mode: '0644'}
-    - { src: 'named/named.blackhole', dest: '/var/named-iiab/named.blackhole' , owner: "{{ dns_user }}" , mode: '0644'}
+    - { src: 'roles/network/templates/named/named.blackhole', dest: '/var/named-iiab/named.blackhole' , owner: "{{ dns_user }}" , mode: '0644'}
 
 - name: Substitute our unit file which uses $OPTIONS from sysconfig
-  template: src=named/{{ dns_service }}.service
+  template: src=roles/network/templates/named/{{ dns_service }}.service
             dest=/etc/systemd/system/{{ dns_service }}.service
             mode=0644
 
 - name: The dns-jail redirect requires the named.blackhole,disabling recursion
 #        in named-iiab.conf, and the redirection of 404 error documents to /
-  template: src=named/dns-jail.conf dest=/etc/{{ apache_config_dir }}/
+  template: src=roles/network/templates/named/dns-jail.conf dest=/etc/{{ apache_config_dir }}/
   when: dns_jail_enabled
 
 - name: Separate enabling required for Debian

roles/network/tasks/squid.yml

@@ -19,32 +19,32 @@
             group={{ item.group }}
             mode={{ item.mode }}
   with_items:
-    - src: 'squid/squid.sysconfig'
+    - src: 'roles/network/templates/squid/squid.sysconfig'
       dest: '/etc/sysconfig/squid'
       owner: 'root'
       group: 'root'
       mode: '0755'
-    - src: 'squid/sites.whitelist.txt'
+    - src: 'roles/network/templates/squid/sites.whitelist.txt'
       dest: '/etc/{{ proxy }}/sites.whitelist.txt'
       owner: '{{ proxy_user }}'
       group: '{{ proxy_user }}'
       mode: '0644'
-    - src: 'squid/allowregex.rules'
+    - src: 'roles/network/templates/squid/allowregex.rules'
       dest: '/etc/{{ proxy }}/allowregex.rules'
       owner: '{{ proxy_user }}'
       group: '{{ proxy_user }}'
       mode: '0644'
-    - src: 'squid/denyregex.rules'
+    - src: 'roles/network/templates/squid/denyregex.rules'
       dest: '/etc/{{ proxy }}/denyregex.rules'
       owner: '{{ proxy_user }}'
       group: '{{ proxy_user }}'
       mode: '0644'
-    - src: 'squid/dstaddress.rules'
+    - src: 'roles/network/templates/squid/dstaddress.rules'
       dest: '/etc/{{ proxy }}/dstaddress.rules'
       owner: '{{ proxy_user }}'
       group: '{{ proxy_user }}'
       mode: '0644'
-    - src: 'squid/iiab-httpcache.j2'
+    - src: 'roles/network/templates/squid/iiab-httpcache.j2'
       dest: '/usr/bin/iiab-httpcache'
       owner: 'root'
       group: 'root'
@@ -64,7 +64,7 @@
         mode=0750
         state=directory
 
-- include: dansguardian.yml
+- include_tasks: roles/network/tasks/dansguardian.yml
   when: dansguardian_install
 
 #- name: Stop Squid

roles/network/tasks/static.yml

@@ -4,7 +4,7 @@
   template: src=network/ifcfg-WAN.j2
             dest=/etc/sysconfig/network-scripts/ifcfg-WAN
 
-- include: NM.yml
+- include_tasks: NM.yml
   when: 'ansible_distribution_version <= "20" and wan_ip != "dhcp"'
 
 - name: Re-read network config files

roles/network/tasks/wondershaper.yml

@@ -1,12 +1,12 @@
 - name: Copy Wondershaper service script
   template: backup=yes
-            src=wondershaper/wondershaper.service
+            src=roles/network/templates/wondershaper/wondershaper.service
             dest=/etc/systemd/system/wondershaper.service
             mode=0644
 
 - name: Copy Wondershaper script
   template: backup=yes
-            src=wondershaper/wondershaper.j2
+            src=roles/network/templates/wondershaper/wondershaper.j2
             dest=/usr/bin/wondershaper
             owner=root
             group=root
@@ -20,7 +20,7 @@
         state=directory
 
 - name: Copy Wondershaper config script
-  template: src=wondershaper/wondershaper.conf
+  template: src=roles/network/templates/wondershaper/wondershaper.conf
             dest=/etc/conf.d/wondershaper.conf
             owner=root
             group=root

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

@@ -1,4 +1,5 @@
 #!/bin/bash -x
+source /etc/iiab/iiab.env
 {% if is_debuntu %}
 IPTABLES=/sbin/iptables
 IPTABLES_DATA=/etc/iptables.up.rules
@@ -6,8 +7,8 @@ IPTABLES_DATA=/etc/iptables.up.rules
 IPTABLES=/usr/sbin/iptables
 IPTABLES_DATA=/etc/sysconfig/iptables
 {% endif %}
-LANIF=`cat /etc/sysconfig/iiab_lan_device`
+LANIF=$IIAB_LAN_DEVICE
-WANIF=`cat /etc/sysconfig/iiab_wan_device`
+WANIF=$IIAB_WAN_DEVICE
 MODE=`grep iiab_network_mode_applied  /etc/iiab/iiab.ini | gawk '{print $3}'`
 
 clear_fw() {
@@ -33,7 +34,7 @@ $IPTABLES -A INPUT -p tcp --dport 5984 -j DROP
 $IPTABLES -A INPUT -p udp --dport 5984 -j DROP
 }
 
-if [  "x$WANIF" == "x" ] || [ "$MODE" == 'Appliance' ]; then
+if [  "x$WANIF" == "xnone" ] || [ "$MODE" == 'Appliance' ]; then
     clear_fw
     # save the rule set
 	{% if is_debuntu %}
@@ -119,7 +120,7 @@ if [ "$captive_portal_enabled" == "True" ];then
    $IPTABLES -t mangle -A internet -j MARK --set-mark 99
    $IPTABLES -t nat -A PREROUTING -i {{ iiab_lan_iface }} -p tcp -m mark --mark 99 -m tcp --dport 80 -j DNAT --to-destination {{ lan_ip }}
 
-elif [ -f /etc/sysconfig/xs_httpcache_on ]; then
+elif [ "$HTTPCACHE_ON" == "True" ]; then
     $IPTABLES  -t nat  -A PREROUTING -i $lan -p tcp --dport 80 ! -d 172.18.96.1 -j DNAT --to 172.18.96.1:3128
 fi
 

roles/nextcloud/tasks/main.yml

@@ -120,7 +120,7 @@
 # Enable nextcloud by copying template to httpd config
 
 # following enables and disables
-- include: nextcloud_enabled.yml
+- include_tasks: nextcloud_enabled.yml
 
 - name: Add Nextcloud to service list
   ini_file: dest='{{ service_filelist }}'

roles/owncloud/tasks/main.yml

@@ -102,7 +102,7 @@
 
 # Enable owncloud by copying template to httpd config
 
-- include: owncloud_enabled.yml
+- include_tasks: owncloud_enabled.yml
   when: owncloud_enabled
 
 - name: Add owncloud to service list

roles/rachel/tasks/main.yml

@@ -20,7 +20,7 @@
      rachel_content_found: True
   when: rachel_content.stat.exists  == true
 
-- include: rachel_enabled.yml
+- include_tasks: rachel_enabled.yml
   when: rachel_enabled and rachel_content_found
 
 - name: Add rachel to service list

roles/sugar-stats/tasks/main.yml

@@ -38,7 +38,7 @@
            enabled=no
   when: not sugar_stats_enabled
 
-- include: statistics-consolidation.yml
+- include_tasks: statistics-consolidation.yml
 
 - name: Add sugar-stats to service list
   ini_file: dest='{{ service_filelist }}'

roles/teamviewer/tasks/main.yml

@@ -5,7 +5,7 @@
   when: ansible_architecture == "armv7l" or not is_redhat
 
 - name: Install Teamviewer if intel
-  include: install.yml
+  include_tasks: install.yml
   when: teamviewer_install
 
 - name: Add teamviewer to service list

roles/vnstat/tasks/main.yml

@@ -14,6 +14,18 @@
             owner=root
             group=root
 
+- name: Checking if lan_iface is set 1
+  include_vars: roles/network/defaults/main.yml
+  when: not iiab_lan_iface is defined
+
+- name: Checking if lan_iface is set 2
+  include_tasks: roles/network/tasks/detected_network.yml
+  when: not iiab_lan_iface is defined
+
+#- name: Checking if lan_iface is set 3
+#  include_tasks: roles/network/tasks/computed_network.yml
+#  when: not iiab_lan_iface is defined
+
 - name: Create database for WAN to collect vnStat data
   shell: /usr/bin/vnstat -i {{ iiab_wan_iface }}
 

roles/wordpress/tasks/main.yml

@@ -1,3 +1,3 @@
 - name: Include the install playbook
-  include: install.yml
+  include_tasks: install.yml
   when: wordpress_install

runtags

@@ -1,16 +1,11 @@
 #!/bin/bash
+# running from a git repo
 PLAYBOOK="iiab.yml"
 INVENTORY="ansible_hosts"
-# Pass cmdline options for ansible
-
-if [ -f /etc/iiab/iiab.env ]
-then
-  . /etc/iiab/iiab.env
-  cd $IIAB_DIR
-fi
-
 CWD=`pwd`
 
+export ANSIBLE_LOG_PATH="$CWD/iiab-debug.log"
+
 if [ ! -f $PLAYBOOK ]
 then
  echo "IIAB Playbook not found."
@@ -41,8 +36,6 @@ do
   fi
 done
 
-# echo $found
-
 taglist=$1
 
 if [ "$found" == "N" ]
@@ -50,5 +43,4 @@ then
   taglist="0-init,"$taglist
 fi
 
-export ANSIBLE_LOG_PATH="$CWD/iiab-debug.log"
 ansible-playbook -i ansible_hosts iiab.yml --connection=local --tags="""$taglist"""

scripts/local_facts.fact

@@ -41,13 +41,24 @@ else
   XO_VERSION="none"
 fi
 
+# upgrades return found, clean installs return 0
+# interruptions return last stage number recorded (1-9)
+if [ -f /etc/iiab/iiab.env ]
+then
+  STAGE=1
+  source /etc/iiab/iiab.env
+  STAGE=$STAGE
+else
+  STAGE=0
+fi
 ANSIBLE_VERSION=$(ansible --version|head -n 1|cut -f 2 -d " ")
 cat <<EOF
 {"phplib_dir"             : "$PHPLIB_DIR",
+"stage"                   : "$STAGE",
 "iiab_branch"             : "$BRANCH",
 "iiab_commit"             : "$COMMIT",
 "xo_model"                : "$XO_VERSION",
-"ansble_version"	  : "$ANSIBLE_VERSION",
+"ansible_version"	  : "$ANSIBLE_VERSION",
 "os"                      : "$OS",
 "os_ver"                  : "$OS_VER"}