Merge pull request #321 from iiab/master

sync from iiab:master

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.4    # WAS: master
+calibreweb_version: master    # WAS: master, 0.6.4
 
 calibreweb_venv_path: /usr/local/calibre-web
 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"

roles/lokole/defaults/main.yml

@@ -5,7 +5,7 @@
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
 # Info needed to install Lokole
-lokole_version: 0.5.2
+lokole_version: 0.5.3
 lokole_admin_user: admin    # lowercase seems nec here (even though uppercase Admin/changeme is IIAB's OOB recommendation!)
 lokole_admin_password: changeme
 lokole_install_path: "{{ content_base }}/lokole"    # /library/lokole

roles/mediawiki/defaults/main.yml

@@ -4,8 +4,8 @@
 # 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!
 
-mediawiki_major_version: "1.33"
-mediawiki_minor_version: "1"
+mediawiki_major_version: "1.34"
+mediawiki_minor_version: "0"
 mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}"
 
 mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}"

roles/network/templates/network/hosts-dnsmasq.j2

@@ -1,3 +1,2 @@
 # Supplied by IIAB sourced by /etc/dnsmasq.d/iiab.conf
-{{ iiab_hostname }}   {{ lan_ip }}
-box   {{ lan_ip }}
+{{ lan_ip }}   box {{ iiab_hostname }}

roles/nginx/tasks/main.yml

@@ -5,28 +5,23 @@
   with_items:
     - { src: "server.conf",dest: "/etc/nginx/" }
     - { src: "nginx.conf",dest: "/etc/nginx/" }
-    - { src: "usb-lib.conf",dest: "/etc/nginx/conf.d/" }
-    - { src: "modules.conf",dest: "/etc/nginx/conf.d/" }
-#    - { src: "admin-console.ini",dest: "/etc/uwsgi/apps-enabled/" }
-# the above should be enough once uwsgi is started
-#    - { src: "uwsgi.unit",dest: "/etc/systemd/system/uwsgi.socket" }
-    - { src: 'ports.conf' , dest: '/etc/{{ apache_service }}/' , mode: '0644' }
+    - { src: "ports.conf" , dest: "/etc/{{ apache_service }}/" }
+    - { src: "iiab.conf.j2",dest: "/etc/nginx/conf.d/iiab.conf" }
   when: nginx_enabled
 
+- name: Clean stale config files
+  file:
+      state: absent
+      path: '{{ item.path }}'
+  with_items:
+    - { path: "/etc/nginx/conf.d/usb-lib.conf" }
+    - { path: "/etc/nginx/conf.d/modules.conf" }
+
 - name: Insure that apache2 is not running -- we may need port swap
   systemd:
     name: apache2
     state: stopped
 
-# optional services
-- name: Install config for Admin Console
-  template:
-    src: admin-console-nginx.conf
-# Comment one or the other to revert from nginx back to apache2, if required
-#    src: admin-console-apache.conf
-    dest: /etc/nginx/conf.d/admin-console.conf
-  when: admin_console_enabled and nginx_enabled
-
 # the below slides in nginx's proxypass config files for apache on localhost
 # via the ports.conf file installed above
 - name: Install proxpass to apache running on localhost port {{ apache_port }}
@@ -73,10 +68,3 @@
     state: restarted
     enabled: true
   when: nginx_enabled
-
-#- name: Enable the uwsgi systemd service
-#  systemd:
-#    name: uwsgi
-#    state: restarted
-#    enabled: true
-#  when: admin_console_enabled and nginx_enabled

roles/nginx/templates/iiab.conf.j2

@@ -1,10 +1,18 @@
+location / {
+    rewrite ^/$ $1/{{ iiab_home_url }};
+}
+
+location /usb {
+    alias /library/www/html/local_content/;
+    autoindex on;
+}
+
+location /local_content/ {
+    autoindex on;
+}
 
 location /modules/ {
     fancyindex on;              # Enable fancy indexes.
     fancyindex_exact_size off;  # Output human-readable file sizes.
     fancyindex_ignore index.htmlf rachel-index.php;
-#    autoindex on;
-#    autoindex_exact_size off;
-#    autoindex_format html;
-#    autoindex_localtime on;
 }

roles/nginx/templates/server.conf

@@ -8,7 +8,6 @@ server {
       access_log {{ apache_log_dir }}/scripts.log scripts;
 
       index  index.php index.html index.htm;
-      rewrite ^/$ $scheme://$server_addr/home/;
 
       # let individual services drop location blocks in conf.d
       include /etc/nginx/conf.d/*;

roles/nginx/templates/usb-lib.conf

@@ -1,7 +0,0 @@
-location /usb {
-  alias /library/www/html/local_content/;
-  autoindex on;
-}
-location /local_content/ {
-  autoindex on;
-}