Merge pull request #2582 from holta/debian-11-vars

Overseas request for immediate testing of IIAB on Debian 11 Bullseye + similarly clean out long-deprecated apache_config_dir from high-level <OS>.yml vars files

scripts/local_facts.fact

@@ -56,8 +56,12 @@ OS_VER=$OS-$VERSION_ID
     #"raspbian-8"   | \
     #"raspbian-9"   | \
 
+# 2020-10-21: Debian 11 (Bullseye) not yet supported but adding this line to
+# its /etc/os-release can help testing this unreleased OS: VERSION_ID="11"
+
 case $OS_VER in
     "debian-10"    | \
+    "debian-11"    | \
     "ubuntu-20"    | \
     "linuxmint-20" | \
     "raspbian-10")

vars/centos-7.yml

@@ -12,7 +12,6 @@ proxy_user: squid
 apache_service: httpd
 apache_user: apache
 apache_conf_dir: httpd/conf.d
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/httpd
 smb_service: smb
 nmb_service: nmb

vars/debian-10.yml

@@ -12,7 +12,6 @@ proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd

vars/debian-11.yml

@@ -0,0 +1,26 @@
+is_debuntu: True
+is_debian: True
+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
+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
+postgresql_version: 13
+systemd_location: /lib/systemd/system

vars/debian-8.yml

@@ -11,7 +11,6 @@ proxy: squid3
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd

vars/debian-9.yml

@@ -12,7 +12,6 @@ proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd

vars/default_vars.yml

@@ -698,6 +698,7 @@ is_linuxmint: False    # Subset of is_ubuntu
 is_linuxmint_20: False
 
 is_debian: False    # Covers both: Debian, Raspberry Pi OS (Raspbian)
+is_debian_11: False
 is_debian_10: False
 is_debian_9: False
 is_debian_8: False

vars/fedora-18.yml

@@ -12,7 +12,6 @@ proxy_user: squid
 apache_service: httpd
 apache_user: apache
 apache_conf_dir: httpd/conf.d
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/httpd
 smb_service: smb
 nmb_service: nmb

vars/fedora-22.yml

@@ -12,7 +12,6 @@ proxy_user: squid
 apache_service: httpd
 apache_user: apache
 apache_conf_dir: httpd/conf.d
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/httpd
 smb_service: smb
 nmb_service: nmb

vars/linuxmint-20.yml

@@ -15,7 +15,6 @@ proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd

vars/raspbian-10.yml

@@ -14,7 +14,6 @@ proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd

vars/raspbian-8.yml

@@ -13,7 +13,6 @@ proxy: squid3
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd

vars/raspbian-9.yml

@@ -14,7 +14,6 @@ proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd

vars/ubuntu-16.yml

@@ -13,7 +13,6 @@ proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd

vars/ubuntu-17.yml

@@ -13,7 +13,6 @@ proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd

vars/ubuntu-18.yml

@@ -13,7 +13,6 @@ proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd

vars/ubuntu-19.yml

@@ -13,7 +13,6 @@ proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd

vars/ubuntu-20.yml

@@ -13,7 +13,6 @@ proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
-apache_config_dir: "{{ apache_conf_dir }}"    # for iiab-admin-console/roles/console/tasks/main.yml Line 150
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd