Merge pull request #434 from iiab/master

Sync from iiab/iiab:master

roles/0-init/tasks/validate_vars.yml

@@ -63,7 +63,7 @@
       #- wondershaper       # Unmaintained
       - sshd
       - openvpn
-      - admin_console       # Coming soon
+      - admin_console
       #- nginx              # MANDATORY
       #- apache             # Dependency installed on demand by other apps/svcs
       #- mysql              # MANDATORY

roles/kolibri/templates/kolibri.service.j2

@@ -10,6 +10,13 @@ Environment=KOLIBRI_HTTP_PORT={{ kolibri_http_port }}
 Environment=KOLIBRI_URL_PATH_PREFIX={{ kolibri_url_without_slash }}
 User={{ kolibri_user }}
 Group={{ apache_user }}
+# 2020-10-03: Kolibri was timing out on RaspiOS & Ubuntu 20 NUC: iiab/iiab#2555
+TimeoutStartSec=1200
+# The following is the systemd default, which is too much for most teachers in
+# low-electricity environments (30-60 sec is about all they can handle before
+# pulling the power cord, typically every hour at the end of class).  But since
+# 90 seconds is the Linux / systemd default, it's prob good enough for now:
+# TimeoutStopSec=90
 # 2020-04-18 @jvonau: comment out both timeouts for now, in favor of 90 seconds
 # or whatever systemd / Kolibri favor? https://github.com/iiab/iiab/issues/2318
 # TimeoutStartSec=infinity

vars/default_vars.yml

@@ -68,15 +68,26 @@ iiab_admin_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGm
 # Time Zone (php needs timezone to be set)
 local_tz: "{{ ansible_date_time.tz }}"
 
-# Read https://github.com/iiab/iiab/wiki/IIAB-Networking
+# Set these to False if you do not want to install IIAB Admin Console
-# Also readable offline @ http://box/info/IIAB-Networking.html
+admin_console_install: True
+admin_console_enabled: True
+#
+# Set to "False" if you do not want to use the latest js-menus
+# either because you use wordpress or another home page
+# or if you prefer the older https://github.com/iiab/iiab-menu (no longer maintained)
+js_menu_install: True
+
+
+# IIAB Networking README: https://github.com/iiab/iiab/tree/master/roles/network
+# IIAB Networking Doc: https://github.com/iiab/iiab/wiki/IIAB-Networking
+# Read it offline too: http://box/info > "IIAB Networking"
 
 # NETWORK PARAMETERS FOLLOW ACROSS THE NEXT 100 LINES, as enabled by Ansible's
-# NETWORK role (/opt/iiab/iiab/roles/network/*) in 4-SERVER-OPTIONS below.
+# NETWORK role (/opt/iiab/iiab/roles/network).  SEE ALSO:
-# SEE ALSO: /opt/iiab/iiab/roles/network/defaults/main.yml
+# https://github.com/iiab/iiab/blob/master/roles/network/defaults/main.yml
 
-# The following variable may be useful in debugging
+# The following variable may be useful in debugging:
-disregard_network: False  # use cache or error out if cache does not exist
+disregard_network: False    # Use cache, or error out if cache does not exist.
 
 iiab_hostname: box
 iiab_domain: lan
@@ -168,10 +179,6 @@ bluetooth_install: True
 bluetooth_enabled: False
 bluetooth_term_enabled: False
 
-# Set to "False" if you want to revert to the older Dynamic Menuing system
-# (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)
-js_menu_install: True    # SEE BELOW: admin_console_install & _enabled.
-
 # UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382
 wondershaper_install: False
 wondershaper_enabled: False
@@ -195,14 +202,6 @@ wan_nameserver:    # wan_nameserver: 192.168.1.254 or 8.8.8.8 or 1.1.1.1
 wan_try_dhcp_before_static_ip: True   # Facilitate field updates w/ cablemodems
 # Details @ roles/network/templates/network/dhcpcd.conf.j2 for /etc/dhcpcd.conf
 
-# Parameters for Aggregate Roles
-# Each Role should have the following variables which are either True or False:
-#   <role-name>_install
-#   <role-name>_enabled
-
-# Past convention had been to install everything in all aggregate roles (stages)
-# And to enable everything in 1-PREP, 2-COMMON, and 3-BASE-SERVER
-
 
 # 1-PREP
 
@@ -239,10 +238,6 @@ pi_swap_file_size: 1024
 
 # 3-BASE-SERVER
 
-# 2020-05-22: Neither in use at the moment. See also js_menu_install (above).
-admin_console_install: True
-admin_console_enabled: True
-
 # 2020-09-24: MySQL / MariaDB is MANDATORY but still evolving - please see:
 # https://github.com/iiab/iiab/blob/master/roles/mysql/tasks/install.yml
 # https://github.com/iiab/iiab/blob/master/roles/3-base-server/tasks/main.yml

vars/local_vars_big.yml

@@ -36,6 +36,20 @@ iiab_admin_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGm
 # Obtain a password hash - OLD WAY:
 #    python -c 'import crypt; print crypt.crypt("<plaintext>", "$6$<salt>")'
 
+# Set these to False if you do not want to install IIAB Admin Console
+admin_console_install: True
+admin_console_enabled: True
+#
+# Set to "False" if you do not want to use the latest js-menus
+# either because you use wordpress or another home page
+# or if you prefer the older https://github.com/iiab/iiab-menu (no longer maintained)
+js_menu_install: True
+
+
+# IIAB Networking README: https://github.com/iiab/iiab/tree/master/roles/network
+# IIAB Networking Doc: https://github.com/iiab/iiab/wiki/IIAB-Networking
+# Read it offline too: http://box/info > "IIAB Networking"
+
 iiab_hostname: box
 iiab_domain: lan
 
@@ -119,10 +133,6 @@ bluetooth_install: True
 bluetooth_enabled: False
 bluetooth_term_enabled: False
 
-# Set to "False" if you want to revert to the older Dynamic Menuing system
-# (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)
-js_menu_install: True
-
 # UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382
 # wondershaper_install: False
 # wondershaper_enabled: False
@@ -141,7 +151,7 @@ sshd_enabled: True
 openvpn_install: True
 openvpn_enabled: False
 # Set /etc/iiab/openvpn_handle in advance here:
-openvpn_handle: 
+openvpn_handle:
 
 # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4.
 # Please see recommendations at: https://itsfoss.com/swap-size/

vars/local_vars_medium.yml

@@ -36,6 +36,20 @@ iiab_admin_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGm
 # Obtain a password hash - OLD WAY:
 #    python -c 'import crypt; print crypt.crypt("<plaintext>", "$6$<salt>")'
 
+# Set these to False if you do not want to install IIAB Admin Console
+admin_console_install: True
+admin_console_enabled: True
+#
+# Set to "False" if you do not want to use the latest js-menus
+# either because you use wordpress or another home page
+# or if you prefer the older https://github.com/iiab/iiab-menu (no longer maintained)
+js_menu_install: True
+
+
+# IIAB Networking README: https://github.com/iiab/iiab/tree/master/roles/network
+# IIAB Networking Doc: https://github.com/iiab/iiab/wiki/IIAB-Networking
+# Read it offline too: http://box/info > "IIAB Networking"
+
 iiab_hostname: box
 iiab_domain: lan
 
@@ -119,10 +133,6 @@ bluetooth_install: True
 bluetooth_enabled: False
 bluetooth_term_enabled: False
 
-# Set to "False" if you want to revert to the older Dynamic Menuing system
-# (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)
-js_menu_install: True
-
 # UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382
 # wondershaper_install: False
 # wondershaper_enabled: False
@@ -141,7 +151,7 @@ sshd_enabled: True
 openvpn_install: True
 openvpn_enabled: False
 # Set /etc/iiab/openvpn_handle in advance here:
-openvpn_handle: 
+openvpn_handle:
 
 # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4.
 # Please see recommendations at: https://itsfoss.com/swap-size/

vars/local_vars_min.yml

@@ -36,6 +36,20 @@ iiab_admin_pwd_hash: $6$xsce51$D.IrrEeLBYIuJkGDmi27pZUGOwPFp98qpl3hxMwWV4hXigFGm
 # Obtain a password hash - OLD WAY:
 #    python -c 'import crypt; print crypt.crypt("<plaintext>", "$6$<salt>")'
 
+# Set these to False if you do not want to install IIAB Admin Console
+admin_console_install: True
+admin_console_enabled: True
+#
+# Set to "False" if you do not want to use the latest js-menus
+# either because you use wordpress or another home page
+# or if you prefer the older https://github.com/iiab/iiab-menu (no longer maintained)
+js_menu_install: True
+
+
+# IIAB Networking README: https://github.com/iiab/iiab/tree/master/roles/network
+# IIAB Networking Doc: https://github.com/iiab/iiab/wiki/IIAB-Networking
+# Read it offline too: http://box/info > "IIAB Networking"
+
 iiab_hostname: box
 iiab_domain: lan
 
@@ -119,10 +133,6 @@ bluetooth_install: True
 bluetooth_enabled: False
 bluetooth_term_enabled: False
 
-# Set to "False" if you want to revert to the older Dynamic Menuing system
-# (prior to IIAB 6.7, this had used https://github.com/iiab/iiab-menu)
-js_menu_install: True
-
 # UNMAINTAINED as of October 2017: https://github.com/iiab/iiab/pull/382
 # wondershaper_install: False
 # wondershaper_enabled: False
@@ -141,7 +151,7 @@ sshd_enabled: True
 openvpn_install: True
 openvpn_enabled: False
 # Set /etc/iiab/openvpn_handle in advance here:
-openvpn_handle: 
+openvpn_handle:
 
 # Some prefer 512MB for Zero W, others prefer 2048MB or higher for RPi 3 and 4.
 # Please see recommendations at: https://itsfoss.com/swap-size/