From e48838da04f0407850ca7f7658d8ca85d3a8041a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 26 Oct 2017 15:56:08 -0500 Subject: [PATCH 1/5] clean up stale variables --- runansible | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/runansible b/runansible index 51cee7876..5db3ab21f 100755 --- a/runansible +++ b/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 ] From 2e53b1a248c14c3cf93c15dfa2f6844199801abf Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 27 Oct 2017 12:32:07 -0500 Subject: [PATCH 2/5] mysql --- roles/3-base-server/tasks/main.yml | 8 +++++--- roles/elgg/meta/main.yml | 3 --- roles/mysql/tasks/main.yml | 1 - roles/nextcloud/meta/main.yml | 3 --- roles/owncloud/meta/main.yml | 3 --- roles/rachel/meta/main.yml | 4 ---- roles/wordpress/meta/main.yml | 3 --- 7 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 roles/elgg/meta/main.yml delete mode 100644 roles/nextcloud/meta/main.yml delete mode 100644 roles/owncloud/meta/main.yml delete mode 100644 roles/rachel/meta/main.yml delete mode 100644 roles/wordpress/meta/main.yml diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index 279322513..26d4af235 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -15,13 +15,15 @@ # has no "when: XXXXX_install" flag tags: base, iiab-admin +- name: MYSQL + include_role: + name: mysql + 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 diff --git a/roles/elgg/meta/main.yml b/roles/elgg/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/elgg/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql } diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index e4819172a..1ff6a2920 100644 --- a/roles/mysql/tasks/main.yml +++ b/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 diff --git a/roles/nextcloud/meta/main.yml b/roles/nextcloud/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/nextcloud/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql } diff --git a/roles/owncloud/meta/main.yml b/roles/owncloud/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/owncloud/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql } diff --git a/roles/rachel/meta/main.yml b/roles/rachel/meta/main.yml deleted file mode 100644 index 09f9b4e28..000000000 --- a/roles/rachel/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -allow_duplicates: yes -dependencies: - - { role: mysql, mysql_enabled: True } diff --git a/roles/wordpress/meta/main.yml b/roles/wordpress/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/wordpress/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql } From 97b829ebba0c531107ea3241bb135c5696b6ff5e Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 27 Oct 2017 12:36:14 -0500 Subject: [PATCH 3/5] postgresql --- roles/4-server-options/tasks/main.yml | 6 ++++++ roles/moodle/meta/main.yml | 3 --- roles/pathagar/meta/main.yml | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 roles/moodle/meta/main.yml delete mode 100644 roles/pathagar/meta/main.yml diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 69173b017..9348d5933 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/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 + - name: AUTHSERVER include_role: name: authserver diff --git a/roles/moodle/meta/main.yml b/roles/moodle/meta/main.yml deleted file mode 100644 index 55dedee1a..000000000 --- a/roles/moodle/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: postgresql } diff --git a/roles/pathagar/meta/main.yml b/roles/pathagar/meta/main.yml deleted file mode 100644 index 55dedee1a..000000000 --- a/roles/pathagar/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: postgresql } From 992c87e79d3724704c1fd62af0801cc0cf155262 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 27 Oct 2017 12:41:48 -0500 Subject: [PATCH 4/5] postgresql tags --- roles/4-server-options/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 9348d5933..7efdffe74 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -31,7 +31,7 @@ include_role: name: postgresql when: postgresql_install - tags: postgresql + tags: postgresql, pathagar, moodle - name: AUTHSERVER include_role: From 4769e3cff87a447b93d0460210c3578a2631570b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 28 Oct 2017 07:39:26 -0400 Subject: [PATCH 5/5] Update main.yml Until we come up with a more readable style...am emulating SSHD, NETWORK and HOMEPAGE @ https://github.com/iiab/iiab/blob/master/roles/4-server-options/tasks/main.yml --- roles/3-base-server/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index 26d4af235..3aa90c43b 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -18,6 +18,7 @@ - name: MYSQL include_role: name: mysql + # has no "when: XXXXX_install" flag tags: base, mysql - name: Make sure there is a content directory