Merge pull request #199 from iiab/master

sync from iiab/iiab

roles/1-prep/files/iiab.conf

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

roles/1-prep/tasks/main.yml

@@ -39,14 +39,23 @@
   set_fact:
     uuid: "{{ stored_uuid.stdout_lines[0] }}"
 
-- name: Does directory /ro exist? (indicating OS is Ubermix)
+#- name: Does directory /ro exist? (indicating OS is Ubermix)
-  stat:
+#  stat:
-    path: /ro
+#    path: /ro
-  register: ro_dir
+#  register: ro_dir
 
-# - debug:
+#- debug:
 #    var: ro_dir
 
+- name: Does 'ubermix' exist in /etc/lsb-release?
+  shell: grep -i ubermix /etc/lsb-release
+  register: grep_ubermix
+  ignore_errors: true
+  #check_mode: no
+
+#- debug:
+#    var: grep_ubermix
+
 - 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
@@ -54,7 +63,9 @@
     owner: root
     group: root
     mode: 0644
-  when: ro_dir.stat.exists
+    force: yes
+  when: grep_ubermix.rc == 0    # 1 if absent in file, 2 if file doesn't exist
+  #when: ro_dir.stat.exists
 
 - name: SSHD
   include_role:

roles/dokuwiki/defaults/main.yml

@@ -1,4 +1,4 @@
 dokuwiki_url: /wiki
 dokuwiki_install: True
 dokuwiki_enabled: False
-dokuwiki_version: "dokuwiki-2018-04-22a"
+dokuwiki_version: "dokuwiki-2018-04-22b"

roles/kalite/tasks/install.yml

@@ -50,6 +50,13 @@
 #       extra_args="--disable-pip-version-check"
   when: internet_available and not is_debuntu
 
+# This effectively does nothing at all on Ubuntu & Raspbian, where libgeos-*
+# pkgs are not installed FWIW.  But it's included to safeguard us across all
+# OS's, in case others OS's like Ubermix later appear.  See #1382 for details.
+# Removing pkgs libgeos-3.6.2 & libgeos-c1v5 fixed the situation on Ubermix!
+- name: Remove libgeos-* pkgs, avoiding KA Lite Django failure on Ubermix
+  shell: apt -y remove "libgeos-*"
+
 - name: Default is to have cronserve started with KA Lite
   set_fact:
     job_scheduler_stanza: ""

roles/nextcloud/tasks/main.yml

@@ -59,11 +59,13 @@
     state: present
   when: is_debuntu
 
-- name: 'Install php{{ php_version }}-mcrypt (debuntu but not ubuntu-18) NOTE: php7.2 dropped mcrypt'
+- name: 'Install php{{ php_version }}-mcrypt IF this is a "pre-2018" distro in the debuntu family. NOTE: PHP 7.1 deprecated mcrypt 1-Dec-2016 and PHP 7.2 dropped it completely 30-Nov-2017, as it should no longer be nec.'
   package:
     name: "php{{ php_version }}-mcrypt"
     state: present
-  when: is_debuntu and not is_ubuntu_18
+  when: is_debuntu and (is_debian_8 or is_debian_9 or is_ubuntu_16 or is_ubuntu_17)
+  # NOT NEC TO TEST FOR is_raspbian_8 OR is_raspbian_9 AS /opt/iiab/iiab/vars/<OS>.yml
+  # DEFINES THESE AS SUBSETS OF is_debian_8 OR is_debian_9 (FOR NOW!)
 
 # we need to install the rpm in order to get the dependencies
 # but we only need to do this the first time

vars/centos-7.yml

@@ -1,5 +1,7 @@
-is_centos: True
 is_redhat: True
+is_centos: True
+is_centos_7: True
+
 dns_service: named
 dns_user: named
 proxy: squid

vars/debian-10.yml

@@ -1,6 +1,7 @@
 is_debuntu: True
 is_debian: True
 is_debian_10: True
+
 dns_service: bind9
 dhcp_service: isc-dhcp-server
 dns_user: bind
@@ -17,8 +18,8 @@ mysql_service: mariadb
 apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
-php_version: 7.1
+php_version: 7.3
-postgresql_version: 10
+postgresql_version: 11
 systemd_location: /lib/systemd/system
 # Upgrade OS's own Calibre to very latest:
 calibre_via_debs: True

vars/debian-8.yml

@@ -1,6 +1,7 @@
 is_debuntu: True
 is_debian: True
 is_debian_8: True
+
 dns_service: bind9
 dns_user: bind
 proxy: squid3

vars/debian-9.yml

@@ -1,6 +1,7 @@
 is_debuntu: True
 is_debian: True
 is_debian_9: True
+
 dns_service: bind9
 dhcp_service: isc-dhcp-server
 dns_user: bind

vars/default_vars.yml

@@ -490,16 +490,22 @@ calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web
 is_debuntu: False
 is_ubuntu: False
 is_ubuntu_18: False
+is_ubuntu_17: False
 is_ubuntu_16: False
 is_debian: False
 is_debian_10: False
 is_debian_9: False
 is_debian_8: False
 is_rpi: False
+is_raspbian_9: False
+is_raspbian_8: False
 
 is_redhat: False
-is_fedora: False
 is_centos: False
+is_centos_7: False
+is_fedora: False
+is_fedora_22: False
+is_fedora_18: False
 
 # How This Works:
 # 1. /opt/iiab/iiab/iiab-install copies scripts/local_facts.fact to /etc/ansible/facts.d/local_facts.fact

vars/fedora-18.yml

@@ -1,4 +1,7 @@
 is_redhat: True
+is_fedora: True
+is_fedora_18: True
+
 dns_service: named
 dns_user: named
 proxy: squid

vars/fedora-22.yml

@@ -1,4 +1,7 @@
 is_redhat: True
+is_fedora: True
+is_fedora_22: True
+
 dns_service: named
 dns_user: named
 proxy: squid

vars/raspbian-8.yml

@@ -1,6 +1,8 @@
-is_rpi: True
-is_debian: True
 is_debuntu: True
+is_debian: True
+is_debian_8: True
+is_raspbian_8: True
+is_rpi: True
 rtc_id: ds3231
 
 dns_service: bind9

vars/raspbian-9.yml

@@ -1,6 +1,8 @@
-is_rpi: True
-is_debian: True
 is_debuntu: True
+is_debian: True
+is_debian_9: True
+is_raspbian_9: True
+is_rpi: True
 rtc_id: ds3231
 
 dns_service: bind9

vars/ubuntu-16.yml

@@ -1,6 +1,7 @@
 is_debuntu: True
 is_ubuntu: True
 is_ubuntu_16: True
+
 dns_service: bind9
 dns_user: bind
 dhcp_service: isc-dhcp-server

vars/ubuntu-17.yml

@@ -1,5 +1,7 @@
 is_debuntu: True
 is_ubuntu: True
+is_ubuntu_17: True
+
 dns_service: bind9
 dns_user: bind
 dhcp_service: isc-dhcp-server

vars/ubuntu-18.yml

@@ -1,6 +1,7 @@
 is_debuntu: True
 is_ubuntu: True
 is_ubuntu_18: True
+
 dns_service: bind9
 dns_user: bind
 dhcp_service: isc-dhcp-server