Merge branch 'master' into master

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

@@ -15,13 +15,16 @@
   # has no "when: XXXXX_install" flag
   tags: base, iiab-admin
 
+- name: MYSQL
+  include_role:
+    name: mysql
+  # has no "when: XXXXX_install" flag
+  tags: base, mysql
+
 - name: Make sure there is a content directory
   file: dest={{ doc_root }}/local_content
         state=directory
 
-- name: Base Server Installed
-  command: echo Base Server Installed
-
 - name: Restart httpd
   service: name={{ apache_service }}
            state=restarted

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

@@ -27,6 +27,12 @@
   # has no "when: XXXXX_install" flag
   tags: base, homepage
 
+- name: POSTGRESQL
+  include_role:
+    name: postgresql
+  when: postgresql_install
+  tags: postgresql, pathagar, moodle
+
 - name: AUTHSERVER
   include_role:
     name: authserver

roles/elgg/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }

roles/moodle/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: postgresql }

roles/mysql/tasks/main.yml

@@ -105,7 +105,6 @@
                state=stopped
       when: not mysql_enabled
 
-
     - name: Add 'mysql' to service list
       ini_file: dest='{{ service_filelist }}'
                     section=mysql

roles/nextcloud/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }

roles/owncloud/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }

roles/pathagar/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: postgresql }

roles/rachel/meta/main.yml

@@ -1,4 +0,0 @@
----
-allow_duplicates: yes
-dependencies:
-    - { role: mysql, mysql_enabled: True }

roles/wordpress/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }

runansible

@@ -4,13 +4,7 @@ INVENTORY="ansible_hosts"
 # Pass cmdline options for ansible
 ARGS="$@"
 
-# copy var files to /etc/iiab for subsequent use
-mkdir -p /etc/iiab
-if [ ! -f /etc/iiab/config_vars.yml ]; then
-  echo "{}" > /etc/iiab/config_vars.yml
-fi
-
-# if vars/local_vars.yml is missing, put a default one in place
+# 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//\"/}
@@ -29,14 +23,24 @@ if [ ! -f ./vars/local_vars.yml ]; then
     esac
 fi
 
+# copy var files to /etc/iiab for subsequent use
+# If iiab.env exists, on second or upgrade run, check for stale variables
+# iiab.env gets created at the end of stage-4 on First Run
 if [ -f /etc/iiab/iiab.env ]
 then
-  . /etc/iiab/iiab.env
-  cd $IIAB_DIR
+  OLD=`grep XSCE /etc/iiab/iiab.env`
+  if [ x"$OLD" != "x" ]
+  then
+    rm /etc/iiab/iiab.env
+  else
+    . /etc/iiab/iiab.env
+    cd $IIAB_DIR
+  fi
 else
-  IIAB_DIR=/opt/iiab/iiab
   mkdir -p /etc/iiab
+  echo "{}" > /etc/iiab/config_vars.yml
 fi
+
 CWD=`pwd`
 
 if [ ! -f $PLAYBOOK ]