Merge branch 'master' into cwivagg/matomo_20220618

vars/debian-11.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_debian: True    # Opposite of is_ubuntu for now
 is_debian_11: True
 
-# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dhcp_service: isc-dhcp-server
-dns_user: bind
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
 apache_user: www-data
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 7.4

vars/debian-12.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_debian: True    # Opposite of is_ubuntu for now
 is_debian_12: True
 
-# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dhcp_service: isc-dhcp-server
-dns_user: bind
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
 apache_user: www-data
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1

vars/default_vars.yml

@@ -201,13 +201,13 @@ dnsmasq_install: True
 dnsmasq_enabled: True
 
 # UNMAINTAINED as of July 2021
-dhcpd_install: False
-dhcpd_enabled: False
+#dhcpd_install: False
+#dhcpd_enabled: False
 
 # UNMAINTAINED as of July 2021
 # named (BIND)
-named_install: False
-named_enabled: False
+#named_install: False
+#named_enabled: False
 block_DNS: False
 
 # Enable in local_vars.yml AFTER installing IIAB!  Then run "cd /opt/iiab/iiab; ./iiab-network"
@@ -357,20 +357,20 @@ nodocs: False
 # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test.
 
 # UNMAINTAINED since about 2012-2017
-xo_services_install: False    # 2020-01-23: UNUSED
-xo_services_enabled: False    # 2020-01-23: Used in idmgr/tasks/main.yml & iiab-admin-console/roles/console/files/htmlf/20-configure.html
+#xo_services_install: False    # 2020-01-23: UNUSED
+#xo_services_enabled: False    # 2020-01-23: Used in idmgr/tasks/main.yml & iiab-admin-console/roles/console/files/htmlf/20-configure.html
 
 # UNMAINTAINED since about 2012-2017
-activity_server_install: False    # 2020-01-23: Used in 5-xo-services/tasks/main.yml (originally defined in activity-server/defaults/main.yml)
-activity_server_enabled: False    # 2020-01-23: Used in activity-server/tasks/main.yml (originally defined in activity-server/defaults/main.yml)
+#activity_server_install: False    # 2020-01-23: Used in 5-xo-services/tasks/main.yml (originally defined in activity-server/defaults/main.yml)
+#activity_server_enabled: False    # 2020-01-23: Used in activity-server/tasks/main.yml (originally defined in activity-server/defaults/main.yml)
 
 # UNMAINTAINED since about 2012-2017: consider 'ejabberd' in Stage 6-GENERIC-APPS below?
-ejabberd_xs_install: False    # 2020-01-23: Used in 5-xo-services/tasks/main.yml & roles/ejabberd_xs/tasks/main.yml
-ejabberd_xs_enabled: False    # 2020-01-23: Used in roles/ejabberd_xs/tasks/main.yml
+#ejabberd_xs_install: False    # 2020-01-23: Used in 5-xo-services/tasks/main.yml & roles/ejabberd_xs/tasks/main.yml
+#ejabberd_xs_enabled: False    # 2020-01-23: Used in roles/ejabberd_xs/tasks/main.yml
 
 # UNMAINTAINED since about 2012-2017: change calibre_port from 8080 to 8010 below, if you use idmgr
-idmgr_install: False    # 2020-01-23: Used in 5-xo-services/tasks/main.yml
-idmgr_enabled: False    # 2020-01-23: UNUSED
+#idmgr_install: False    # 2020-01-23: Used in 5-xo-services/tasks/main.yml
+#idmgr_enabled: False    # 2020-01-23: UNUSED
 
 
 # 6-GENERIC-APPS
@@ -388,17 +388,17 @@ azuracast_https_port: 10443
 azuracast_port_range_prefix: 10
 
 # UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056
-dokuwiki_install: False
-dokuwiki_enabled: False
-dokuwiki_url: /dokuwiki
+#dokuwiki_install: False
+#dokuwiki_enabled: False
+#dokuwiki_url: /dokuwiki
 
 # UNMAINTAINED as of November 2019
-ejabberd_install: False
-ejabberd_enabled: False
+#ejabberd_install: False
+#ejabberd_enabled: False
 
 # UNMAINTAINED as of July 2021
-elgg_install: False
-elgg_enabled: False
+#elgg_install: False
+#elgg_enabled: False
 # elgg_mysql_password: $6$iiab51$jeTwnATcbaa92xo0QBTgjLBU.5aVDDrbKeNyyC99R/TAWz6pvfzj.L7lfnOVVjD78nxqT.gkNn6XZmuRV0W3o1
 elgg_mysql_password: elgg4kids
 
@@ -486,7 +486,7 @@ kiwix_port: 3000
 iiab_zim_path: "{{ content_base }}/zims"    # /library/zims
 kiwix_incl_apk: False
 kiwix_apk_url: /software/kiwix
-kiwix_apk_src: https://download.kiwix.org/release/kiwix-android/kiwix-3.4.5.apk
+kiwix_apk_src: https://download.kiwix.org/release/kiwix-android/kiwix.apk
 
 # 2020-09-24: BOTH VALUES BELOW ARE IGNORED as PostgreSQL is installed on
 # demand as a dependency -- by Moodle &/or Pathagar

vars/linuxmint-20.yml

@@ -6,23 +6,17 @@ is_ubuntu_20: True
 is_linuxmint: True
 is_linuxmint_20: True
 
-# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dns_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 7.4

vars/linuxmint-21.yml

@@ -6,23 +6,17 @@ is_ubuntu_2204: True
 is_linuxmint: True
 is_linuxmint_21: True
 
-# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dns_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1

vars/raspbian-11.yml

@@ -6,23 +6,17 @@ is_debian_11: True
 is_raspbian: True
 is_raspbian_11: True
 
-# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dns_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
 apache_user: www-data
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: ssh
 sshd_service: ssh
 php_version: 7.4

vars/ubuntu-2004.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
 is_ubuntu_2004: True
 
-# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dns_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 7.4

vars/ubuntu-2204.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
 is_ubuntu_2204: True
 
-# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dns_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1

vars/ubuntu-2210.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
 is_ubuntu_2210: True
 
-# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
-# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
-dns_service: bind9
-dns_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1