From 9a5faa8832f989d3ae094ee780302697785a47d0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:26:25 -0400 Subject: [PATCH 1/8] added+clarified PostgreSQL flags --- vars/medium.localvars | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vars/medium.localvars b/vars/medium.localvars index 3f2d9fd21..9248e0eaf 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -47,7 +47,7 @@ dansguardian_enabled: False # 3-BASE-SERVER -# MySQL & PostgreSQL are auto-installed around here as necessary. +# MySQL mandatory installation here # 4-SERVER-OPTIONS @@ -58,6 +58,11 @@ openvpn_enabled: False # openvpn_cron_enabled: True # If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! +# roles/1-prep/tasks/computed_vars.yml, roles/4-server-options/tasks/main.yml +postgresql_install: False +postgresql_enabled: False + # Unmaintained # authserver_install: False # authserver_enabled: False From ecd68a30b80a1daaa162d830c0885f0abcedd701 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:30:51 -0400 Subject: [PATCH 2/8] Clarified PostgreSQL --- vars/default_vars.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index c99fddfba..a9461ba54 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -165,7 +165,8 @@ iiab_home_url: /home # iiab_home_url: /wordpress # iiab_home_url: /wiki - either dokuwiki or mediawiki -# PostgreSQL - SEE roles/1-prep/tasks/computed_vars.yml, roles/4-server-options/tasks/main.yml, roles/postgresql/tasks/main.yml +# PostgreSQL auto-installed by Moodle &/or Pathagar as nec, no need to touch! +# roles/1-prep/tasks/computed_vars.yml, roles/4-server-options/tasks/main.yml postgresql_install: False postgresql_enabled: False From a92c1b31117755e7b86b5dfc155a3a3f05888a26 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:32:35 -0400 Subject: [PATCH 3/8] mysql passwd was stated twice --- vars/default_vars.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index a9461ba54..497a13901 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -136,7 +136,6 @@ allow_apache_sudo: False # MySQL - THESE HAVE NO EFFECT - DE FACTO DEFAULTS IN roles/1-prep/tasks/computed_vars.yml, roles/mysql/tasks/main.yml mysql_install: True mysql_enabled: True -# password is fixmysql # mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0 mysql_root_password: fixmysql From 08bdf48ea3f9dfb1ad9e0453c8e11972ce14f10b Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:33:23 -0400 Subject: [PATCH 4/8] Abbreviated. Explanation is in default_vars.html --- vars/medium.localvars | 1 - 1 file changed, 1 deletion(-) diff --git a/vars/medium.localvars b/vars/medium.localvars index 9248e0eaf..73e1e96c9 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -59,7 +59,6 @@ openvpn_enabled: False # If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" # PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! -# roles/1-prep/tasks/computed_vars.yml, roles/4-server-options/tasks/main.yml postgresql_install: False postgresql_enabled: False From f8fb51243aced2e9aee5bddd1e29ded486be3886 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:45:03 -0400 Subject: [PATCH 5/8] cleanup+clarifs --- vars/medium.localvars | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vars/medium.localvars b/vars/medium.localvars index 73e1e96c9..32a8e70db 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -45,9 +45,13 @@ dansguardian_enabled: False # wondershaper_install: False # wondershaper_enabled: False +# 1-PREP + +# 2-COMMON + # 3-BASE-SERVER -# MySQL mandatory installation here +# roles/mysql runs here # 4-SERVER-OPTIONS @@ -58,6 +62,8 @@ openvpn_enabled: False # openvpn_cron_enabled: True # If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# roles/network runs here (MANY SETTINGS ABOVE) + # PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! postgresql_install: False postgresql_enabled: False From 54b1dfe54b84f3b5a9bd32467b6dca62d2ce3103 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:45:13 -0400 Subject: [PATCH 6/8] cleanup+clarifs --- vars/default_vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 497a13901..4f286be21 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -129,9 +129,9 @@ schooltool_enabled: False # Needed if you want http://box/common/services/power_off.php to work allow_apache_sudo: False -# HTTPD role runs here. +# roles/httpd runs here -# IIAB-ADMIN role runs here. +# roles/iiab-admin runs here # MySQL - THESE HAVE NO EFFECT - DE FACTO DEFAULTS IN roles/1-prep/tasks/computed_vars.yml, roles/mysql/tasks/main.yml mysql_install: True @@ -151,7 +151,7 @@ openvpn_cron_enabled: False openvpn_install: True openvpn_enabled: False -# NETWORK role runs here. +# roles/network runs here (MANY SETTINGS ABOVE) # Homepage # Default to the GUI where the selection is made or override in local_vars.yml From 239a7c6ffcc38482f6bea20567bdd958b6736c0a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:49:56 -0400 Subject: [PATCH 7/8] MySQL mandatory (clarif) --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 4f286be21..48555b782 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -133,7 +133,7 @@ allow_apache_sudo: False # roles/iiab-admin runs here -# MySQL - THESE HAVE NO EFFECT - DE FACTO DEFAULTS IN roles/1-prep/tasks/computed_vars.yml, roles/mysql/tasks/main.yml +# MySQL MANDATORY - THESE SETTINGS HAVE NO EFFECT - SEE roles/1-prep/tasks/computed_vars.yml, roles/mysql/tasks/main.yml mysql_install: True mysql_enabled: True # mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0 From 7c2b8a97033295d015937be2531e4204fc8364a0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 30 Oct 2017 13:50:04 -0400 Subject: [PATCH 8/8] MySQL mandatory (clarif) --- vars/medium.localvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/medium.localvars b/vars/medium.localvars index 32a8e70db..ac39788c6 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -51,7 +51,7 @@ dansguardian_enabled: False # 3-BASE-SERVER -# roles/mysql runs here +# roles/mysql runs here (mandatory) # 4-SERVER-OPTIONS