From e88fec334c678acb4079c2acb5c94eaecbfa7a9a Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 11 Jul 2020 13:48:08 -0400 Subject: [PATCH 01/12] Calibre-Web 0.6.8 -> master --- roles/calibre-web/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/defaults/main.yml b/roles/calibre-web/defaults/main.yml index 57b109bc1..a9d134696 100644 --- a/roles/calibre-web/defaults/main.yml +++ b/roles/calibre-web/defaults/main.yml @@ -14,7 +14,7 @@ # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! -calibreweb_version: 0.6.8 # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7 +calibreweb_version: master # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7, 0.6.8 calibreweb_venv_path: /usr/local/calibre-web-py3 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py" From 56b393c6391aae4178a299dee969fea027909795 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Wed, 15 Jul 2020 16:05:19 -0400 Subject: [PATCH 02/12] initial checkin --- roles/kiwix/tasks/install.yml | 3 +++ roles/nginx/tasks/install.yml | 1 + roles/nginx/templates/iiab.conf.j2 | 12 ++++++++++++ vars/default_vars.yml | 3 +++ 4 files changed, 19 insertions(+) diff --git a/roles/kiwix/tasks/install.yml b/roles/kiwix/tasks/install.yml index 104d6bb7c..50dc4c5d3 100644 --- a/roles/kiwix/tasks/install.yml +++ b/roles/kiwix/tasks/install.yml @@ -117,6 +117,9 @@ #mode: '0644' when: apache_installed is defined +# install kiwix app +- include_tasks: roles/nginx/tasks/homepage.yml + when: kiwix_incl_apk # 5. RECORD Kiwix AS INSTALLED diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 359e1bdd8..10aec2b11 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -33,6 +33,7 @@ with_items: - { src: 'server.conf.j2', dest: '/etc/nginx/server.conf' } - { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' } + - { src: 'mime-types.j2', dest: '/etc/nginx/mime.types' } #- { src: 'ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' } # Moved to enable-or-disable.yml #- { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" } # Moved into homepage.yml below diff --git a/roles/nginx/templates/iiab.conf.j2 b/roles/nginx/templates/iiab.conf.j2 index 76b8c0aa0..954d0f805 100644 --- a/roles/nginx/templates/iiab.conf.j2 +++ b/roles/nginx/templates/iiab.conf.j2 @@ -26,3 +26,15 @@ location /js-menu/ { fancyindex off; # autoindex off; } } + +location /software/ { + fancyindex on; # Enable fancy indexes. + fancyindex_exact_size off; # Output human-readable file sizes. + location ~* \.(apk)$ { + add_header Content-Type application/vnd.android.package-archive; + } + + location ~* \.(zim)$ { + add_header Content-Type application/zip; + } +} diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 413b963fb..e2bb37e3c 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -450,6 +450,9 @@ kiwix_install: True kiwix_enabled: True 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.apk moodle_install: False moodle_enabled: False From d48ca96d3e35844685917c743e249056867ef9c3 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Wed, 15 Jul 2020 16:11:36 -0400 Subject: [PATCH 03/12] forgot the new guy --- roles/nginx/templates/mime.types.j2 | 89 +++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 roles/nginx/templates/mime.types.j2 diff --git a/roles/nginx/templates/mime.types.j2 b/roles/nginx/templates/mime.types.j2 new file mode 100644 index 000000000..0007f96a9 --- /dev/null +++ b/roles/nginx/templates/mime.types.j2 @@ -0,0 +1,89 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; + + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + application/vnd.android.package-archive apk; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; + application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} From 67aeade1583c87ff09373f6eda09fee9b9b04558 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Wed, 15 Jul 2020 16:12:20 -0400 Subject: [PATCH 04/12] and the other new guy --- roles/kiwix/tasks/kiwix-apk.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 roles/kiwix/tasks/kiwix-apk.yml diff --git a/roles/kiwix/tasks/kiwix-apk.yml b/roles/kiwix/tasks/kiwix-apk.yml new file mode 100644 index 000000000..1a9e61d11 --- /dev/null +++ b/roles/kiwix/tasks/kiwix-apk.yml @@ -0,0 +1,18 @@ +# Install kiwix android app apk for downloading +- name: Create {{ doc_root }}{{ kiwix_apk_url }} directory + file: + path: "{{ doc_root }}{{ kiwix_apk_url }}" + state: directory + +- name: Download kiwix.apk to {{ doc_root }}{{ kiwix_apk_url }} + get_url: + url: "{{ kiwix_apk_src }}" # https://download.kiwix.org/release/kiwix-android/kiwix.apk + dest: "{{ doc_root }}{{ kiwix_apk_url }}" + timeout: "{{ download_timeout }}" + when: internet_available | bool + +- name: Symlink {{ doc_root }}{{ kiwix_apk_url }}/zims -> {{ iiab_zim_path }}/content + file: + src: "{{ iiab_zim_path }}/content" # /library/zims/content + path: "{{ doc_root }}{{ kiwix_apk_url }}/zims" # /library/www/html/softare/kiwix/zims + state: link From 4128b0e47ede175ee5fb2b49247a3bcea7385b21 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Wed, 15 Jul 2020 16:16:03 -0400 Subject: [PATCH 05/12] name change --- roles/nginx/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index 10aec2b11..45a7b2402 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -33,7 +33,7 @@ with_items: - { src: 'server.conf.j2', dest: '/etc/nginx/server.conf' } - { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' } - - { src: 'mime-types.j2', dest: '/etc/nginx/mime.types' } + - { src: 'mime.types.j2', dest: '/etc/nginx/mime.types' } #- { src: 'ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' } # Moved to enable-or-disable.yml #- { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" } # Moved into homepage.yml below From d1f0635b8218eebaef21ee8fc8d13d60d63267d5 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Wed, 15 Jul 2020 16:25:37 -0400 Subject: [PATCH 06/12] typo --- roles/kiwix/tasks/install.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/kiwix/tasks/install.yml b/roles/kiwix/tasks/install.yml index 50dc4c5d3..acc981a31 100644 --- a/roles/kiwix/tasks/install.yml +++ b/roles/kiwix/tasks/install.yml @@ -118,7 +118,8 @@ when: apache_installed is defined # install kiwix app -- include_tasks: roles/nginx/tasks/homepage.yml +- name: Install Kiwix Android app + include_tasks: kiwix-apk.yml when: kiwix_incl_apk # 5. RECORD Kiwix AS INSTALLED From 7227062c21623b411d5ae4be8728d5ece7218591 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Wed, 15 Jul 2020 17:20:21 -0400 Subject: [PATCH 07/12] do what kiwix does --- roles/nginx/templates/mime.types.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nginx/templates/mime.types.j2 b/roles/nginx/templates/mime.types.j2 index 0007f96a9..ce5c12a66 100644 --- a/roles/nginx/templates/mime.types.j2 +++ b/roles/nginx/templates/mime.types.j2 @@ -63,6 +63,7 @@ types { application/octet-stream dmg; application/octet-stream iso img; application/octet-stream msi msp msm; + application/octet-stream zim; application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; From 868851c0a260b7b7707ed5aa82be8e621eb67d6a Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Thu, 16 Jul 2020 11:37:58 -0400 Subject: [PATCH 08/12] make default for medical --- vars/local_vars_medical.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/local_vars_medical.yml b/vars/local_vars_medical.yml index f8a48535f..c9f5c68bf 100644 --- a/vars/local_vars_medical.yml +++ b/vars/local_vars_medical.yml @@ -1,4 +1,5 @@ # Default overrides +kiwix_incl_apk: True kalite_install: False kalite_enabled: False captiveportal_install: True From b44526cc275838cc85ea8240ec41d4861de3dcff Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 23 Jul 2020 22:41:39 -0500 Subject: [PATCH 09/12] networking - RpiOS - May impact bluetooth networking. Only supply 'iiab' and use networking service for wired slaves needing br0. --- roles/network/tasks/rpi_debian.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/network/tasks/rpi_debian.yml b/roles/network/tasks/rpi_debian.yml index 426685864..f31fb8842 100644 --- a/roles/network/tasks/rpi_debian.yml +++ b/roles/network/tasks/rpi_debian.yml @@ -41,6 +41,12 @@ dest: /etc/network/interfaces.d/iiab src: network/rpi.j2 #src: network/iiab.j2 2019-02-05: caused ./iiab-network to fail repeatedly in recent days on one particular RPi 3, even after reboot ("Unable to start service networking: Job for networking.service failed..." at "Restart the networking service if appropriate") ...leaving dnsmasq off (#1452) + when: iiab_wired_lan_iface is defined + +- name: Use bind-dynamic for dnsmasq + template: + dest: /etc/dnsmasq.d/dnsmasq-iiab + src: network/dnsmasq-iiab when: iiab_lan_iface == "br0" - name: Stopping services @@ -60,6 +66,7 @@ name: networking enabled: yes state: restarted + when: iiab_wired_lan_iface is defined - name: Restart hostapd when WiFi is present but not when using WiFi as gateway systemd: From 264dc81f03b24bba947ebfc6ac278b8a9a476f1b Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 23 Jul 2020 22:59:36 -0500 Subject: [PATCH 10/12] use bind-dynamic for dnsmasq on RpiOS --- roles/network/templates/network/dnsmasq-iiab | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/network/templates/network/dnsmasq-iiab b/roles/network/templates/network/dnsmasq-iiab index ca3911e4f..eee4cb6ae 100644 --- a/roles/network/templates/network/dnsmasq-iiab +++ b/roles/network/templates/network/dnsmasq-iiab @@ -1,5 +1,10 @@ #IIAB +{% if is_raspbian is true %} +bind-dynamic +{% else %} bind-interfaces +{% endif %} + # Wan nameserver if manually set {% if wan_nameserver is not none %} no-resolv From 016cdfcc37275b5dce7b08568c201dfba58e3807 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 23 Jul 2020 23:09:01 -0500 Subject: [PATCH 11/12] use bind-dynamic for dnsmasq on RpiOS - 2 --- roles/network/templates/network/dnsmasq-iiab | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/network/templates/network/dnsmasq-iiab b/roles/network/templates/network/dnsmasq-iiab index eee4cb6ae..691dd0b42 100644 --- a/roles/network/templates/network/dnsmasq-iiab +++ b/roles/network/templates/network/dnsmasq-iiab @@ -1,12 +1,11 @@ #IIAB -{% if is_raspbian is true %} +{% if is_raspbian %} bind-dynamic {% else %} bind-interfaces {% endif %} - -# Wan nameserver if manually set {% if wan_nameserver is not none %} +# Wan nameserver if manually set no-resolv server={{ wan_nameserver }} {% endif %} From 7e0b2ec6618474dd6779e8e4e74a30e9f498ec2b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 28 Jul 2020 18:46:19 -0400 Subject: [PATCH 12/12] Gitea 1.12.2 -> 1.12.3 --- roles/gitea/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index ea5dc28d2..a19a2506a 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -9,7 +9,7 @@ # Info needed to install Gitea: -gitea_version: 1.12.2 +gitea_version: 1.12.3 iset_suffixes: i386: 386 x86_64: amd64