Merge pull request #198 from iiab/master

sync from iiab/iiab

roles/1-prep/files/iiab.conf

@@ -0,0 +1,3 @@
+d /var/log/apache2 1750 www-data www-data
+d /var/log/munin/ 1755 munin adm
+d /var/log/mongodb 1755 mongodb root

roles/1-prep/tasks/main.yml

@@ -39,6 +39,23 @@
   set_fact:
     uuid: "{{ stored_uuid.stdout_lines[0] }}"
 
+- name: Does directory /ro exist? (indicating OS is Ubermix)
+  stat:
+    path: /ro
+  register: ro_dir
+
+# - debug:
+#     var: ro_dir
+
+- name: If so, install /etc/tmpfiles.d/iiab.conf to create /var/log subdirs on each boot, so {Apache, MongoDB, Munin} run on Ubermix
+  copy:
+    src: roles/1-prep/files/iiab.conf
+    dest: /etc/tmpfiles.d/
+    owner: root
+    group: root
+    mode: 0644
+  when: ro_dir.stat.exists
+
 - name: SSHD
   include_role:
     name: sshd

roles/calibre-web/defaults/main.yml

@@ -5,7 +5,7 @@
 calibreweb_install: False
 calibreweb_enabled: False
 
-calibreweb_port: 8083
+calibreweb_port: 8083    # PORT VARIABLE HAS NO EFFECT (as of January 2019)
 calibreweb_url: /books
 calibreweb_venv_path: /usr/local/calibre-web
 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"

roles/mediawiki/defaults/main.yml

@@ -1,5 +1,5 @@
-mediawiki_major_version: "1.31"
+mediawiki_major_version: "1.32"
-mediawiki_minor_version: "1"
+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/tasks/hosts.yml

@@ -10,7 +10,7 @@
   lineinfile:
     path: /etc/hosts
     regexp: '^172\.18\.96\.1'
-    line: '172.18.96.1     {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box iiab-server.lan'
+    line: '172.18.96.1     {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box box.lan'
     state: present
   when: iiab_lan_iface != "none" and not installing
 
@@ -18,7 +18,7 @@
   lineinfile:
     path: /etc/hosts
     regexp: '^127\.0\.0\.1'
-    line: '127.0.0.1     localhost.localdomain localhost {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box iiab-server.lan'
+    line: '127.0.0.1     localhost.localdomain localhost {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box box.lan'
     owner: root
     group: root
     mode: 0644

vars/default_vars.yml

@@ -411,7 +411,7 @@ calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
 # Calibre-Web alternative to Calibre, offers a clean/modern UX
 calibreweb_install: False
 calibreweb_enabled: False
-calibreweb_port: 8083
+calibreweb_port: 8083    # PORT VARIABLE HAS NO EFFECT (as of January 2019)
 # http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
 calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web

vars/local_vars_big.yml

@@ -276,7 +276,7 @@ calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
 # Calibre-Web alternative to Calibre, offers a clean/modern UX
 calibreweb_install: True
 calibreweb_enabled: True
-calibreweb_port: 8083
+calibreweb_port: 8083    # PORT VARIABLE HAS NO EFFECT (as of January 2019)
 # http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
 calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web

vars/local_vars_medium.yml

@@ -276,7 +276,7 @@ calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
 # Calibre-Web alternative to Calibre, offers a clean/modern UX
 calibreweb_install: True
 calibreweb_enabled: True
-calibreweb_port: 8083
+calibreweb_port: 8083    # PORT VARIABLE HAS NO EFFECT (as of January 2019)
 # http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
 calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web

vars/local_vars_min.yml

@@ -276,7 +276,7 @@ calibre_web_path: calibre  #NEEDS WORK: https://github.com/iiab/iiab/issues/529
 # Calibre-Web alternative to Calibre, offers a clean/modern UX
 calibreweb_install: False
 calibreweb_enabled: False
-calibreweb_port: 8083
+calibreweb_port: 8083    # PORT VARIABLE HAS NO EFFECT (as of January 2019)
 # http://box/books works.  Add {box/libros, box/livres, box/livros, box/liv} etc?
 calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web