Merge pull request #358 from iiab/master

sync from iiab:master

iiab-install

@@ -11,7 +11,7 @@ CWD=`pwd`
 OS=`grep ^ID= /etc/*release|cut -d= -f2`
 OS=${OS//\"/}
 MIN_RPI_KERN=4.19.79       # Can be further updated if necessary, when Raspbian's Oct 2019 kernels are more officially fixed such that running 'rpi-update' will no longer be nec soon, see: https://github.com/iiab/iiab/issues/1993
-MIN_ANSIBLE_VER=2.8.7      # Ansible 2.8.3 and 2.8.6 have serious bugs, preventing their use with IIAB.
+MIN_ANSIBLE_VER=2.8.8      # Ansible 2.8.3 and 2.8.6 have serious bugs, preventing their use with IIAB.
 
 if [ ! -f /etc/iiab/local_vars.yml ]; then
 

roles/0-DEPRECATED-ROLES/dokuwiki/tasks/enable.yml

@@ -16,15 +16,15 @@
 
 # NGINX
 
-- name: "SHIM: Enable http://box{{ dokuwiki_url }} via NGINX, by installing {{ nginx_config_dir }}/dokuwiki-nginx.conf from template"    # http://box/dokuwiki
+- name: "SHIM: Enable http://box{{ dokuwiki_url }} via NGINX, by installing {{ nginx_conf_dir }}/dokuwiki-nginx.conf from template"    # http://box/dokuwiki
   template:
     src: dokuwiki-nginx.conf.j2
-    dest: "{{ nginx_config_dir }}/dokuwiki-nginx.conf"
+    dest: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf"
   when: nginx_install and dokuwiki_enabled
 
-- name: "SHIM: Disable http://box{{ dokuwiki_url }} via NGINX, by removing {{ nginx_config_dir }}/dokuwiki-nginx.conf"    # http://box/dokuwiki
+- name: "SHIM: Disable http://box{{ dokuwiki_url }} via NGINX, by removing {{ nginx_conf_dir }}/dokuwiki-nginx.conf"    # http://box/dokuwiki
   file:
-    path: "{{ nginx_config_dir }}/dokuwiki-nginx.conf"
+    path: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf"
     state: absent
   when: nginx_install and not dokuwiki_enabled