Merge pull request #453 from iiab/master

Sync from iiab/iiab:master

roles/gitea/defaults/main.yml

@@ -9,7 +9,7 @@
 
 # Info needed to install Gitea:
 
-gitea_version: 1.12.5
+gitea_version: 1.12.6
 iset_suffixes:
   i386: 386
   x86_64: amd64

roles/kiwix/defaults/main.yml

@@ -26,9 +26,9 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml"
 # http://download.kiwix.org/release/kiwix-tools/ ...or sometimes...
 # http://download.kiwix.org/nightly/
 
-kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.2-3
-kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.2-3
-kiwix_version_i686: kiwix-tools_linux-i586-3.1.2-3
+kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.2-4
+kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.2-4
+kiwix_version_i686: kiwix-tools_linux-i586-3.1.2-4
 
 # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
 # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")

roles/network/tasks/restart.yml

@@ -89,7 +89,8 @@
   systemd:
     name: "{{ dhcp_service2 }}"
     state: restarted
-  when: (not no_net_restart or (is_ubuntu_20 and wifi_up_down)) or (iiab_stage|int == 9)
+  when: (not no_net_restart or (is_ubuntu and wifi_up_down)) or (iiab_stage|int == 9)
+  #when: (not no_net_restart or (is_ubuntu_20 and wifi_up_down)) or (iiab_stage|int == 9)
   #when: (not no_net_restart or (is_ubuntu_20 and wifi_up_down))
   #when: (iiab_network_mode != "Appliance")    # Sufficient b/c br0 exists thanks to /etc/network/interfaces.d/iiab
   #when: iiab_network_mode != "Appliance" and iiab_wan_iface != discovered_wireless_iface

roles/pbx/tasks/install.yml

@@ -36,7 +36,7 @@
       Asterisk  and FreePBX work on other OS's / distros, Thank
       You!  http://FAQ.IIAB.IO        ###############################################################################
 
-- name: Check if freepbx is already installed
+- name: Check if /etc/systemd/system/freepbx.service is already installed
   stat: 
     path: /etc/systemd/system/freepbx.service
   register: freepbx_installed

scripts/local_facts.fact

@@ -60,10 +60,14 @@ OS_VER=$OS-$VERSION_ID
 # 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"
 
+# 2020-11-14: Ubuntu 21.04 (Hirsute Hippo) not yet supported but this
+# unreleased OS can help testing.
+
 case $OS_VER in
     "debian-10"    | \
     "debian-11"    | \
     "ubuntu-20"    | \
+    "ubuntu-21"    | \
     "linuxmint-20" | \
     "raspbian-10")
        ;;

vars/default_vars.yml

@@ -688,6 +688,7 @@ calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
 is_debuntu: False    # Covers all 4: Ubuntu, Linux Mint, Debian, Raspberry Pi OS (Raspbian)
 
 is_ubuntu: False    # Covers: Ubuntu, Linux Mint
+is_ubuntu_21: False
 is_ubuntu_20: False
 is_ubuntu_19: False
 is_ubuntu_18: False

vars/ubuntu-21.yml

@@ -0,0 +1,28 @@
+is_debuntu: True
+is_ubuntu: True
+is_ubuntu_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
+smb_service: smbd
+nmb_service: nmbd
+systemctl_program: /bin/systemctl
+# issue raised 
+mysql_service: mariadb
+apache_log: /var/log/apache2/access.log
+sshd_package: openssh-server
+sshd_service: ssh
+php_version: 7.4    # 2020-11-14: Change to 8.0 very soon?
+# "postgresql_version: 11.2" failed (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 19.04)
+postgresql_version: 12    # 2020-11-14: Change to 13 very soon?
+systemd_location: /lib/systemd/system