From 8c72a379d4fa43b425b222fefd0473223f8d10cb Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 01:33:55 -0500 Subject: [PATCH 01/23] Update debian-10.yml --- vars/debian-10.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/debian-10.yml b/vars/debian-10.yml index dd820dd0c..702abd91b 100644 --- a/vars/debian-10.yml +++ b/vars/debian-10.yml @@ -17,8 +17,8 @@ mysql_service: mariadb apache_log: /var/log/apache2/access.log sshd_package: openssh-server sshd_service: ssh -php_version: 7.1 -postgresql_version: 10 +php_version: 7.3 +postgresql_version: 11 systemd_location: /lib/systemd/system # Upgrade OS's own Calibre to very latest: calibre_via_debs: True From da4a1eecc4c15638977ac7b8f2432066dfa2859d Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:27:24 -0500 Subject: [PATCH 02/23] Update main.yml --- roles/nextcloud/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 205d360d8..c14eca54c 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -59,11 +59,11 @@ 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 (debuntu prior to 2018) NOTE: php7.2 dropped mcrypt' package: name: "php{{ php_version }}-mcrypt" state: present - when: is_debuntu and not is_ubuntu_18 + when: is_debuntu and (is_raspbian_8 or is_raspbian_9 or is_debian_8 or is_debian_9 or is_ubuntu_16 or is_ubuntu_17) # we need to install the rpm in order to get the dependencies # but we only need to do this the first time From 2cdc26dbe7ec16f44750f2f7b2476aa1f7548285 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:29:07 -0500 Subject: [PATCH 03/23] Update ubuntu-17.yml --- vars/ubuntu-17.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/ubuntu-17.yml b/vars/ubuntu-17.yml index a198e9d3d..be1c6ef0a 100644 --- a/vars/ubuntu-17.yml +++ b/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 From 9c6ab33cdb363414be4911ed656189b0db60f656 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:30:32 -0500 Subject: [PATCH 04/23] Update raspbian-8.yml --- vars/raspbian-8.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml index 9b66b9af2..595a90668 100644 --- a/vars/raspbian-8.yml +++ b/vars/raspbian-8.yml @@ -1,6 +1,7 @@ -is_rpi: True -is_debian: True is_debuntu: True +is_debian: True +is_raspbian_8: True +is_rpi: True rtc_id: ds3231 dns_service: bind9 From c12da600b6f9dbac139e014b70df6c992a9318c5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:31:17 -0500 Subject: [PATCH 05/23] Update raspbian-9.yml --- vars/raspbian-9.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index 3084cb761..ca6be4444 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -1,6 +1,7 @@ -is_rpi: True -is_debian: True is_debuntu: True +is_debian: True +is_raspbian_9: True +is_rpi: True rtc_id: ds3231 dns_service: bind9 From 0b31b53cd29a901ba907662112cd6db6e7733317 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:32:19 -0500 Subject: [PATCH 06/23] Update ubuntu-16.yml --- vars/ubuntu-16.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml index e8eea1d8d..72958fc00 100644 --- a/vars/ubuntu-16.yml +++ b/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 From 8f379f0a4f1769a427f5da1b07a2d52b9c77e291 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:32:35 -0500 Subject: [PATCH 07/23] Update ubuntu-18.yml --- vars/ubuntu-18.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/ubuntu-18.yml b/vars/ubuntu-18.yml index b1bd1fd53..94d8b48ac 100644 --- a/vars/ubuntu-18.yml +++ b/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 From f9175a1c28093ecd3d04c8fcf6a8c27660142f1e Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:33:31 -0500 Subject: [PATCH 08/23] Update debian-8.yml --- vars/debian-8.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/debian-8.yml b/vars/debian-8.yml index 8027ed3a6..821c56188 100644 --- a/vars/debian-8.yml +++ b/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 From 85f5154e918962f8952e980f6f8c3cd8475bb2a9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:33:50 -0500 Subject: [PATCH 09/23] Update debian-9.yml --- vars/debian-9.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/debian-9.yml b/vars/debian-9.yml index 856c9fa7e..d8140de67 100644 --- a/vars/debian-9.yml +++ b/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 From 0693f8f631f0e3c77f9e50f8f9c26aff01fa2029 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:34:11 -0500 Subject: [PATCH 10/23] Update debian-10.yml --- vars/debian-10.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/debian-10.yml b/vars/debian-10.yml index 702abd91b..c7553ef2b 100644 --- a/vars/debian-10.yml +++ b/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 From b0208d2cc2fb0e7091012cef1f03ae07291cfed7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:34:48 -0500 Subject: [PATCH 11/23] Update centos-7.yml --- vars/centos-7.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vars/centos-7.yml b/vars/centos-7.yml index 1c584df8a..c51d7af32 100644 --- a/vars/centos-7.yml +++ b/vars/centos-7.yml @@ -1,5 +1,7 @@ -is_centos: True is_redhat: True +is_centos: True +is_centos7: True + dns_service: named dns_user: named proxy: squid From df5048b073cbd32189ac9f36ee556285a0cba920 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:35:23 -0500 Subject: [PATCH 12/23] Update fedora-18.yml --- vars/fedora-18.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/fedora-18.yml b/vars/fedora-18.yml index 71377feca..2af0a7e13 100644 --- a/vars/fedora-18.yml +++ b/vars/fedora-18.yml @@ -1,4 +1,6 @@ is_redhat: True +is_fedora_18: True + dns_service: named dns_user: named proxy: squid From a2d2a37c7641144a58002d5b6fd5ae27d25e6883 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:36:02 -0500 Subject: [PATCH 13/23] Update fedora-22.yml --- vars/fedora-22.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/fedora-22.yml b/vars/fedora-22.yml index 4c295e475..1a13e34e2 100644 --- a/vars/fedora-22.yml +++ b/vars/fedora-22.yml @@ -1,4 +1,6 @@ is_redhat: True +is_fedora_22: True + dns_service: named dns_user: named proxy: squid From c4f13e529f6ffa934638ec2f04111515fbeeba88 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:36:42 -0500 Subject: [PATCH 14/23] Update raspbian-9.yml --- vars/raspbian-9.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index ca6be4444..e33bf0e0c 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -1,5 +1,6 @@ is_debuntu: True is_debian: True +is_debian_9: True is_raspbian_9: True is_rpi: True rtc_id: ds3231 From 206dd742acaf6ab1fbadce28d462c4fc2c3f0fc4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:37:03 -0500 Subject: [PATCH 15/23] Update raspbian-8.yml --- vars/raspbian-8.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml index 595a90668..ec8f3abd8 100644 --- a/vars/raspbian-8.yml +++ b/vars/raspbian-8.yml @@ -1,5 +1,6 @@ is_debuntu: True is_debian: True +is_debian_8: True is_raspbian_8: True is_rpi: True rtc_id: ds3231 From b375b482f3982715b16c442618aaa647e0d191ae Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 03:46:37 -0500 Subject: [PATCH 16/23] Update main.yml --- roles/nextcloud/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index c14eca54c..854c5015e 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -59,11 +59,13 @@ state: present when: is_debuntu -- name: 'Install php{{ php_version }}-mcrypt (debuntu prior to 2018) NOTE: php7.2 dropped mcrypt' +- name: 'Install php{{ php_version }}-mcrypt (debuntu prior to 2018) NOTE: php7.2 dropped mcrypt as this should no longer be nec' package: name: "php{{ php_version }}-mcrypt" state: present - when: is_debuntu and (is_raspbian_8 or is_raspbian_9 or is_debian_8 or is_debian_9 or is_ubuntu_16 or is_ubuntu_17) + 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/.yml + # DEFINES THESE AS SUBSETS OF is_debian_8 OR is_debian_9 # we need to install the rpm in order to get the dependencies # but we only need to do this the first time From 7adc794b802044ee12e6bd200f079cb8b07b128d Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 06:04:01 -0500 Subject: [PATCH 17/23] Update main.yml --- roles/nextcloud/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 854c5015e..1fad34b80 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -59,7 +59,7 @@ state: present when: is_debuntu -- name: 'Install php{{ php_version }}-mcrypt (debuntu prior to 2018) NOTE: php7.2 dropped mcrypt as this should no longer be nec' +- name: 'Install php{{ php_version }}-mcrypt -- on "debuntu" distros released prior to 2018. NOTE: php7.1 deprecated mcrypt 1-Dec-2016 and php7.2 dropped it completely 30-Nov-2017, as it should no longer be nec.' package: name: "php{{ php_version }}-mcrypt" state: present From c263beb39a151e7c795ef05a8e6a21d913095d96 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 06:06:16 -0500 Subject: [PATCH 18/23] Update main.yml --- roles/nextcloud/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 1fad34b80..7f0f94b49 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -65,7 +65,7 @@ state: present 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/.yml - # DEFINES THESE AS SUBSETS OF is_debian_8 OR is_debian_9 + # 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 From cd00d77d2b2f8bd2be2c26c5880542962ecda1db Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 06:08:33 -0500 Subject: [PATCH 19/23] Update fedora-18.yml --- vars/fedora-18.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/fedora-18.yml b/vars/fedora-18.yml index 2af0a7e13..a86d7c192 100644 --- a/vars/fedora-18.yml +++ b/vars/fedora-18.yml @@ -1,4 +1,5 @@ is_redhat: True +is_fedora: True is_fedora_18: True dns_service: named From bcc56214e4edfbea0eb53dc59dcadc0099e6635f Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 06:08:54 -0500 Subject: [PATCH 20/23] Update fedora-22.yml --- vars/fedora-22.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/fedora-22.yml b/vars/fedora-22.yml index 1a13e34e2..a7e182fa2 100644 --- a/vars/fedora-22.yml +++ b/vars/fedora-22.yml @@ -1,4 +1,5 @@ is_redhat: True +is_fedora: True is_fedora_22: True dns_service: named From ea357c53312d65fdf99cc667d37fe35b6ebfbc86 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 06:33:55 -0500 Subject: [PATCH 21/23] Update centos-7.yml --- vars/centos-7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/centos-7.yml b/vars/centos-7.yml index c51d7af32..c2efe174c 100644 --- a/vars/centos-7.yml +++ b/vars/centos-7.yml @@ -1,6 +1,6 @@ is_redhat: True is_centos: True -is_centos7: True +is_centos_7: True dns_service: named dns_user: named From 26d7129aece2892cccb563252649192445f24c53 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 07:45:08 -0500 Subject: [PATCH 22/23] Update default_vars.yml --- vars/default_vars.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 08aff8424..a58d8a361 100644 --- a/vars/default_vars.yml +++ b/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 From cdeb0073010f83932418ef5b760b1197a8a42218 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 13 Jan 2019 07:55:48 -0500 Subject: [PATCH 23/23] Update main.yml --- roles/nextcloud/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 7f0f94b49..e09f43644 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -59,7 +59,7 @@ state: present when: is_debuntu -- name: 'Install php{{ php_version }}-mcrypt -- on "debuntu" distros released prior to 2018. NOTE: php7.1 deprecated mcrypt 1-Dec-2016 and php7.2 dropped it completely 30-Nov-2017, as it should no longer be nec.' +- 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