From 5e6fc6f5b16373fd19e55357f912d6654432003a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:25:56 -0400 Subject: [PATCH 1/9] Update default_vars.yml --- vars/default_vars.yml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 4f3ec18a8..93bdd39f4 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -126,14 +126,6 @@ py_captive_portal_enabled: True # captive_portal_install: False # captive_portal_enabled: False -# Squid -squid_install: False -squid_enabled: False - -# DansGuardian -dansguardian_install: False -dansguardian_enabled: False - # Wonder Shaper # Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382 wondershaper_install: False @@ -147,8 +139,7 @@ wan_ip: dhcp wan_netmask: wan_gateway: wan_nameserver: -# exFAT is auto-enabled for all "debuntu" OS's as of Nov 2017, in roles/2-common/tasks/packages.yml#L35-L36 -# exFAT_enabled: True + # Parameters for Aggregate Roles # Each Role should have the following variables which are either True or False: @@ -180,8 +171,17 @@ openvpn_server: xscenet.net openvpn_server_virtual_ip: 10.8.0.1 openvpn_server_port: 1194 + # 2-COMMON +# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 +# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : +exFAT_enabled: True + +# /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local +# It's put in place by 2-common/tasks/iiab-startup.yml at the end of Stage 2. + + # 3-BASE-SERVER # roles/httpd (Apache configuration) runs here @@ -202,7 +202,16 @@ mysql_root_password: fixmysql # 4-SERVER-OPTIONS -# roles/network runs here (MANY SETTINGS ABOVE) +# dnsmasq, named, dhcpd basics are installed here...in preparation for +# the full roles/network = iiab-network that runs after 9-LOCAL-ADDONS + +# Squid +squid_install: False +squid_enabled: False + +# DansGuardian +dansguardian_install: False +dansguardian_enabled: False # Homepage iiab_home_url: /home From e3fe1473d3d92cb370dc1b0222739918f64cb771 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:26:02 -0400 Subject: [PATCH 2/9] Update local_vars_min.yml --- vars/local_vars_min.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index f1d019891..641ee14d0 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -62,13 +62,6 @@ py_captive_portal_install: True py_captive_portal_enabled: True # In a pinch, disable it by running: systemctl disable py-captive-portal -# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: -squid_install: False -squid_enabled: False - -dansguardian_install: False -dansguardian_enabled: False - # Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382 # wondershaper_install: False # wondershaper_enabled: False @@ -88,8 +81,17 @@ openvpn_handle: "" # The following seems necessary on CentOS: # openvpn_cron_enabled: True + # 2-COMMON +# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 +# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : +exFAT_enabled: True + +# /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local +# It's put in place by 2-common/tasks/iiab-startup.yml at the end of Stage 2. + + # 3-BASE-SERVER # Make this False to disable http://box/common/services/power_off.php button: @@ -104,7 +106,16 @@ apache_high_php_limits: False # 4-SERVER-OPTIONS -# roles/network runs here (MANY SETTINGS ABOVE) +# dnsmasq, named, dhcpd basics are installed here...in preparation for +# the full roles/network = iiab-network that runs after 9-LOCAL-ADDONS + +# Squid +squid_install: False +squid_enabled: False + +# DansGuardian +dansguardian_install: False +dansguardian_enabled: False # PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! postgresql_install: False From ae75dd60ac5729fe0e46c167f5cc3b0d8338d799 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:26:06 -0400 Subject: [PATCH 3/9] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 77f860faf..a19d4851c 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -62,13 +62,6 @@ py_captive_portal_install: True py_captive_portal_enabled: True # In a pinch, disable it by running: systemctl disable py-captive-portal -# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: -squid_install: False -squid_enabled: False - -dansguardian_install: False -dansguardian_enabled: False - # Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382 # wondershaper_install: False # wondershaper_enabled: False @@ -88,8 +81,17 @@ openvpn_handle: "" # The following seems necessary on CentOS: # openvpn_cron_enabled: True + # 2-COMMON +# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 +# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : +exFAT_enabled: True + +# /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local +# It's put in place by 2-common/tasks/iiab-startup.yml at the end of Stage 2. + + # 3-BASE-SERVER # Make this False to disable http://box/common/services/power_off.php button: @@ -104,7 +106,16 @@ apache_high_php_limits: False # 4-SERVER-OPTIONS -# roles/network runs here (MANY SETTINGS ABOVE) +# dnsmasq, named, dhcpd basics are installed here...in preparation for +# the full roles/network = iiab-network that runs after 9-LOCAL-ADDONS + +# Squid +squid_install: False +squid_enabled: False + +# DansGuardian +dansguardian_install: False +dansguardian_enabled: False # PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! postgresql_install: False From b547eb71ead216183a8190ba2cc52a2e5bdd8f64 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:26:08 -0400 Subject: [PATCH 4/9] Update local_vars_big.yml --- vars/local_vars_big.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 8b680a2cc..575461c35 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -62,13 +62,6 @@ py_captive_portal_install: True py_captive_portal_enabled: True # In a pinch, disable it by running: systemctl disable py-captive-portal -# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: -squid_install: True -squid_enabled: True - -dansguardian_install: True -dansguardian_enabled: True - # Unmaintained as of October 2017: https://github.com/iiab/iiab/pull/382 # wondershaper_install: False # wondershaper_enabled: False @@ -88,8 +81,17 @@ openvpn_handle: "" # The following seems necessary on CentOS: # openvpn_cron_enabled: True + # 2-COMMON +# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 +# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : +exFAT_enabled: True + +# /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local +# It's put in place by 2-common/tasks/iiab-startup.yml at the end of Stage 2. + + # 3-BASE-SERVER # Make this False to disable http://box/common/services/power_off.php button: @@ -104,7 +106,16 @@ apache_high_php_limits: False # 4-SERVER-OPTIONS -# roles/network runs here (MANY SETTINGS ABOVE) +# dnsmasq, named, dhcpd basics are installed here...in preparation for +# the full roles/network = iiab-network that runs after 9-LOCAL-ADDONS + +# Squid +squid_install: False +squid_enabled: False + +# DansGuardian +dansguardian_install: False +dansguardian_enabled: False # PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! postgresql_install: False From 1fd9a3903ea5f864527c4cc44710176cff3eda6f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:37:28 -0400 Subject: [PATCH 5/9] Update default_vars.yml --- vars/default_vars.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 93bdd39f4..367e46069 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -174,8 +174,8 @@ openvpn_server_port: 1194 # 2-COMMON -# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 -# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : +# Auto-enabled in roles/2-common/tasks/packages.yml as set in +# 0-init/defaults/main.yml AND 0-init/tasks/main.yml : exFAT_enabled: True # /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local @@ -184,8 +184,7 @@ exFAT_enabled: True # 3-BASE-SERVER -# roles/httpd (Apache configuration) runs here - +# httpd (Apache) # Make this False to disable http://box/common/services/power_off.php button: apache_allow_sudo: True # For schools that use WordPress and/or Moodle intensively, see iiab/iiab #1147 From be1b73253beafbc18092210fe8965b63b1b9eddd Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:37:33 -0400 Subject: [PATCH 6/9] Update local_vars_min.yml --- vars/local_vars_min.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 641ee14d0..470c99ee2 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -84,9 +84,8 @@ openvpn_handle: "" # 2-COMMON -# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 -# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : -exFAT_enabled: True +# exFAT_enabled: True is auto-enabled in roles/2-common/tasks/packages.yml +# as set in 0-init/defaults/main.yml AND 0-init/tasks/main.yml # /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local # It's put in place by 2-common/tasks/iiab-startup.yml at the end of Stage 2. From af679836a28e1a35fb58d6d41f806ba74fb53901 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:37:38 -0400 Subject: [PATCH 7/9] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index a19d4851c..c50b5551f 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -84,9 +84,8 @@ openvpn_handle: "" # 2-COMMON -# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 -# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : -exFAT_enabled: True +# exFAT_enabled: True is auto-enabled in roles/2-common/tasks/packages.yml +# as set in 0-init/defaults/main.yml AND 0-init/tasks/main.yml # /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local # It's put in place by 2-common/tasks/iiab-startup.yml at the end of Stage 2. From 3e7c47e600eb1b667a5583ba0108b509996992f2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:37:42 -0400 Subject: [PATCH 8/9] Update local_vars_big.yml --- vars/local_vars_big.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 575461c35..c501140b3 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -84,9 +84,8 @@ openvpn_handle: "" # 2-COMMON -# Auto-enabled for "debuntu" OS's, in roles/2-common/tasks/packages.yml#L35-L36 -# in 0-init/defaults/main.yml AND 0-init/tasks/main.yml : -exFAT_enabled: True +# exFAT_enabled: True is auto-enabled in roles/2-common/tasks/packages.yml +# as set in 0-init/defaults/main.yml AND 0-init/tasks/main.yml # /usr/libexec/iiab-startup.sh is much like autoexec.bat & /etc/rc.local # It's put in place by 2-common/tasks/iiab-startup.yml at the end of Stage 2. From e92d1e9908be641d9a7b90949bab3c0817917b72 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 15 Oct 2018 10:42:35 -0400 Subject: [PATCH 9/9] Update local_vars_big.yml --- vars/local_vars_big.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index c501140b3..79d5569ed 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -109,12 +109,12 @@ apache_high_php_limits: False # the full roles/network = iiab-network that runs after 9-LOCAL-ADDONS # Squid -squid_install: False -squid_enabled: False +squid_install: True +squid_enabled: True # DansGuardian -dansguardian_install: False -dansguardian_enabled: False +dansguardian_install: True +dansguardian_enabled: True # PostgreSQL - auto-installed by Moodle and/or Pathagar - no need to touch! postgresql_install: False