Merge pull request #392 from iiab/master

sync from iiab:master

roles/2-common/templates/iiab_const.py.j2

@@ -3,6 +3,10 @@
 iiab_etc_path = '{{ iiab_etc_path }}'
 iiab_env_file = '{{ iiab_env_file }}'
 iiab_ini_file = '{{ iiab_ini_file }}'
+iiab_local_vars_file = '{{ iiab_local_vars_file }}'
+iiab_base = '{{ iiab_base }}'
+iiab_repo_dir = '{{ iiab_dir }}'
+iiab_state_file = '{{ iiab_state_file }}'
 
 kiwix_cat_path = iiab_etc_path + '/kiwix_catalog.json'
 zim_path = '{{ iiab_zim_path }}'

roles/4-server-options/tasks/main.yml

@@ -20,7 +20,7 @@
 - name: Install Bluetooth - only on Raspberry Pi
   include_role:
     name: bluetooth
-  when: is_raspbian and bluetooth_install
+  when: rpi_model != "none" and bluetooth_install
 
 - name: USB_LIB
   include_role:

roles/bluetooth/tasks/install.yml

@@ -1,4 +1,17 @@
-- name: "Install bluetooth packages"
+- name: Disable built-in serial uart in /boot/firmware/usercfg.txt on ubuntu
+  lineinfile:
+    path: /boot/firmware/usercfg.txt
+    line: "enable_uart=0"
+    state: present
+  when: is_ubuntu and rpi_model != "none"
+
+- name: Install pi-bluetooth package on Ubuntu
+  package:
+    name: pi-bluetooth
+    state: present
+  when: is_ubuntu and rpi_model != "none"
+
+- name: Install bluetooth packages
   package:
     name:
       - bluetooth
@@ -43,7 +56,7 @@
     dest: /etc/systemd/system/bluetooth.service
     src: /lib/systemd/system/bluetooth.service
 
-- name: Add  -C --noplugin=sap to execStart of bluetooth service
+- name: Add -C --noplugin=sap to execStart of bluetooth service
   lineinfile:
     path: /etc/systemd/system/bluetooth.service
     regexp: '^ExecStart=/usr/lib/bluetooth/bluetoothd'

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.0-1
-kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.0-1
-kiwix_version_i686: kiwix-tools_linux-i586-3.1.0-1
+kiwix_version_armhf: kiwix-tools_linux-armhf-3.1.0-2
+kiwix_version_linux64: kiwix-tools_linux-x86_64-3.1.0-2
+kiwix_version_i686: kiwix-tools_linux-i586-3.1.0-2
 
 # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
 # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")

roles/kolibri/templates/kolibri-nginx.conf.j2

@@ -2,7 +2,7 @@ location {{ kolibri_url }} {
     proxy_set_header        Host            $http_host;
     proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header        X-Scheme        $scheme;
-    proxy_set_header        X-Script-Name   /kolibri;
+    proxy_set_header        X-Script-Name   {{ kolibri_url_without_slash }};
     proxy_pass http://127.0.0.1:8009;
 }
 

roles/nginx/README.md

@@ -10,7 +10,7 @@
 
 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX.
 
-3. Current state of IIAB App/Service migrations as of 2020-03-26:
+3. Current state of IIAB App/Service migrations as of 2020-04-24:
 
    1. These support "Native" NGINX but ***NOT*** Apache
       * Admin Console
@@ -47,4 +47,4 @@
       * pbx [*]
       * transmission [*]
 
-[*] The 5 above starred roles could use improvement, as of 2020-03-26.
+[*] The 5 above starred roles could use improvement, as of 2020-04-24.

roles/nginx/templates/iiab.conf.j2

@@ -16,3 +16,13 @@ location /modules/ {
     fancyindex_exact_size off;  # Output human-readable file sizes.
     fancyindex_ignore index.htmlf rachel-index.php;
 }
+
+location /js-menu/ {
+    fancyindex on;    # autoindex on;
+    location /js-menu/menu-files/js/ {
+        fancyindex off;    # autoindex off;
+    }
+    location /js-menu/menu-files/services/ {
+        fancyindex off;    # autoindex off;
+    }
+}

roles/www_base/templates/iiab-refresh-wiki-docs.sh

@@ -46,7 +46,7 @@ lynx -reload -source https://github.com/XSCE/xsce/blob/release-6.2/ReleaseNotes6
 
 # Download Raspberry Pi guides
 wget -nc https://www.raspberrypi.org/magpi-issues/Beginners_Guide_v1.pdf -O $DOCSPATH/Raspberry_Pi_Beginners_Guide_v1.pdf || true    # Overrides set -e
-wget -nc https://dn.odroid.com/IoT/other_doc.pdf -O $DOCSPATH/Raspberry_Pi_User_Guide_v4.pdf || true
+wget -nc https://archive.org/15/items/other_doc/other_doc.pdf -O $DOCSPATH/Raspberry_Pi_User_Guide_v4.pdf || true
 
 # Copy PDF from Lokole playbook
 cp -p "{{ iiab_dir }}/roles/lokole/Lokole-IIAB_Users_Manual.pdf" $DOCSPATH    # From /opt/iiab/iiab
@@ -55,7 +55,7 @@ cp -p "{{ iiab_dir }}/roles/lokole/Lokole-IIAB_Users_Manual.pdf" $DOCSPATH    #
 
 # ...on main page (http://box/info)
 sed -i -r "s|https://www.raspberrypi.org/magpi-issues/Beginners_Guide_v1.pdf|docs/Raspberry_Pi_Beginners_Guide_v1.pdf|g" $DESTPATH/index.html
-sed -i -r "s|https://dn.odroid.com/IoT/other_doc.pdf|docs/Raspberry_Pi_User_Guide_v4.pdf|g" $DESTPATH/index.html
+sed -i -r "s|https://.*archive.org/15/items/other_doc/other_doc.pdf|docs/Raspberry_Pi_User_Guide_v4.pdf|g" $DESTPATH/index.html
 sed -i -r "s|https://github.com/iiab/iiab/blob/master/roles/lokole/Lokole-IIAB_Users_Manual.pdf|docs/Lokole-IIAB_Users_Manual.pdf|g" $DESTPATH/index.html
 
 # ...and within subpages