diff --git a/iiab-install b/iiab-install index 6d38c5598..6042cd338 100755 --- a/iiab-install +++ b/iiab-install @@ -10,7 +10,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ -MIN_ANSIBLE_VER=2.6.14 +MIN_ANSIBLE_VER=2.6.15 if [ ! -f /etc/iiab/local_vars.yml ]; then diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index b48f3c631..12091701a 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -8,7 +8,7 @@ # https://git.coolaj86.com/coolaj86/gitea-installer.sh # Information needed to install Gitea -gitea_version: "1.7.3" +gitea_version: "1.7.4" iset_suffixes: i386: "386" x86_64: "amd64" @@ -42,8 +42,6 @@ gitea_home: "/home/{{ gitea_user }}" # SSH credentials stored here gitea_run_directory: "{{ gitea_root_directory }}" gitea_url: /gitea -gitea_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ gitea_url }}" - gitea_port: 61734 # leet for GITEA # Data locations diff --git a/roles/gitea/tasks/install.yml b/roles/gitea/tasks/install.yml index 71514da6c..ac61ce342 100644 --- a/roles/gitea/tasks/install.yml +++ b/roles/gitea/tasks/install.yml @@ -184,7 +184,5 @@ value: "{{ gitea_run_directory }}" - option: gitea_url value: "{{ gitea_url }}" - - option: gitea_full_url - value: "{{ gitea_full_url }}" - option: gitea_enabled value: "{{ gitea_enabled }}" diff --git a/roles/gitea/templates/app.ini.j2 b/roles/gitea/templates/app.ini.j2 index ddae9b7e1..00d503fdb 100644 --- a/roles/gitea/templates/app.ini.j2 +++ b/roles/gitea/templates/app.ini.j2 @@ -118,8 +118,8 @@ FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd [server] ; The protocol the server listens on. One of 'http', 'https', 'unix' or 'fcgi'. PROTOCOL = http -DOMAIN = localhost -ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s{{ gitea_url }}/ +DOMAIN = {{ iiab_hostname }}.{{ iiab_domain }} +ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s{{ gitea_url }}/ ; The address to listen on. Either a IPv4/IPv6 address or the path to a unix socket. HTTP_ADDR = 0.0.0.0 HTTP_PORT = {{ gitea_port }} diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 4ff81da90..05d486aed 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -10,9 +10,9 @@ # Which kiwix-tools to download from http://download.iiab.io/packages/ # As obtained from http://download.kiwix.org/release/kiwix-tools/ or http://download.kiwix.org/nightly/ -kiwix_version_armhf: "kiwix-tools_linux-armhf-0.9.0" -kiwix_version_linux64: "kiwix-tools_linux-x86_64-0.9.0" -kiwix_version_i686: "kiwix-tools_linux-i586-0.9.0" +kiwix_version_armhf: "kiwix-tools_linux-armhf-1.1.0" +kiwix_version_linux64: "kiwix-tools_linux-x86_64-1.1.0" +kiwix_version_i686: "kiwix-tools_linux-i586-1.1.0" # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2" # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content") # v0.10 for i686 published Oct 2016 ("experimental") REPLACED IN EARLY 2018, thx to Matthieu Gautier: diff --git a/scripts/ansible b/scripts/ansible index 047219d52..20969885c 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.8" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.9" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index baae8e3b0..402c5abba 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.8" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.9" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive diff --git a/scripts/ansible-2.7.x b/scripts/ansible-2.7.x index 5942c50a9..5309c1d19 100755 --- a/scripts/ansible-2.7.x +++ b/scripts/ansible-2.7.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.8" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.7.9" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact index b83d5305a..40d6bec1d 100755 --- a/scripts/local_facts.fact +++ b/scripts/local_facts.fact @@ -19,17 +19,19 @@ DHCPCD_PATH=`which dhcpcd` NM_PATH=`which NetworkManager` case $OS_VER in - "fedora-18" | \ - "fedora-22" | \ - "debian-8" | \ - "debian-9" | \ - "debian-10" | \ - "ubuntu-16" | \ - "ubuntu-17" | \ - "ubuntu-18" | \ - "centos-7" | \ - "raspbian-8"| \ - "raspbian-9") + "fedora-18" | \ + "fedora-22" | \ + "debian-8" | \ + "debian-9" | \ + "debian-10" | \ + "ubuntu-16" | \ + "ubuntu-17" | \ + "ubuntu-18" | \ + "ubuntu-19" | \ + "centos-7" | \ + "raspbian-8" | \ + "raspbian-9" | \ + "raspbian-10") ;; *) OS_VER="OS_not_supported" ;; diff --git a/vars/default_vars.yml b/vars/default_vars.yml index b223ed73e..1862e6175 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -532,20 +532,26 @@ minetest_flat_world: False # Platforms - turn all off and let /opt/iiab/iiab/vars/.yml turn on as appropriate # Wide to narrow (insofar as poss) -is_debuntu: False +is_debuntu: False # covers all 3: Ubuntu, Debian, Raspbian + is_ubuntu: False +is_ubuntu_19: False is_ubuntu_18: False is_ubuntu_17: False is_ubuntu_16: False -is_debian: False + +is_debian: False # covers both: Debian, Raspbian is_debian_10: False is_debian_9: False is_debian_8: False + +is_raspbian: False # covers RPi HW and non-RPi HW versions of Raspbian +is_raspbian_10: False is_raspbian_9: False is_raspbian_8: False -is_rpi: False +is_rpi: False # 2019-03-23 - doesn't yet test for RPi HW, but hopefully soon: https://github.com/iiab/iiab/issues/1406 -is_redhat: False +is_redhat: False # not well supported as of 2019, see: https://github.com/iiab/iiab/issues/1434 is_centos: False is_centos_7: False is_fedora: False diff --git a/vars/raspbian-10.yml b/vars/raspbian-10.yml new file mode 100644 index 000000000..7813a7200 --- /dev/null +++ b/vars/raspbian-10.yml @@ -0,0 +1,42 @@ +is_debuntu: True +is_debian: True +is_debian_10: True +is_raspbian: True +is_raspbian_10: True +is_rpi: True +rtc_id: ds3231 + +# 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_config_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: ssh +sshd_service: ssh +php_version: 7.3 +postgresql_version: 11 +systemd_location: /lib/systemd/system +# Upgrade Raspbian Buster's Calibre 3.x: (via role/calibre/tasks/debs.yml, +# with .deb's released about 5-10 days after Calibre's quasi-monthly releases) +calibre_via_debs: True +# roles/calibre/tasks/py-installer.yml FAILS on ARM as of 2018-05-10: +calibre_via_python: False + +# minetest for rpi +minetest_server_bin: /library/games/minetest/bin/minetestserver +minetest_working_dir: /library/games/minetest +minetest_game_dir: /library/games/minetest/games/minetest_game +minetest_rpi_src_url: http://www.nathansalapat.com/downloads/0.4.17.1.tar.gz +minetest_rpi_src: minetest-0.4.17.1.tar.gz diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml index 815479109..b4e4e59eb 100644 --- a/vars/raspbian-8.yml +++ b/vars/raspbian-8.yml @@ -1,6 +1,7 @@ is_debuntu: True is_debian: True is_debian_8: True +is_raspbian: True is_raspbian_8: True is_rpi: True rtc_id: ds3231 diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index d507e2f27..6108184cf 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -1,6 +1,7 @@ is_debuntu: True is_debian: True is_debian_9: True +is_raspbian: True is_raspbian_9: True is_rpi: True rtc_id: ds3231 diff --git a/vars/ubuntu-19.yml b/vars/ubuntu-19.yml new file mode 100644 index 000000000..5250db84c --- /dev/null +++ b/vars/ubuntu-19.yml @@ -0,0 +1,31 @@ +is_debuntu: True +is_ubuntu: True +is_ubuntu_19: 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_config_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.2 +# "postgresql_version: 10.3" fails (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 18.04) +postgresql_version: 10 +systemd_location: /lib/systemd/system +# Upgrade Ubuntu 19.x's Calibre 3.39.1+ to very latest +calibre_via_debs: False +calibre_via_python: True