From 515e3e59cdd4fbe75c7fbba5517141315c6cb3cb Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 27 Apr 2018 03:54:27 +0000 Subject: [PATCH 1/7] just to get initial run. not function tested (nextcloud) --- roles/nextcloud/tasks/main.yml | 3 ++- roles/sugarizer/tasks/main.yml | 8 ++++++++ vars/ubuntu-18.yml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index b54fe9669..ece214e7d 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -56,7 +56,8 @@ - "php{{ php_version }}-mysql" - "php{{ php_version }}-curl" - "php{{ php_version }}-intl" - - "php{{ php_version }}-mcrypt" + # - "php{{ php_version }}-mcrypt" + - "mcrypt" when: is_debuntu # we need to install the rpm in order to get the dependencies diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index e75c871c8..f9bc95a11 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -40,6 +40,14 @@ - nodejs - npm +- name: Install npm (ubuntu-18) + package: + name: "{{ item }}" + state: present + when: internet_available and is_ubuntu_18 + with_items: + - npm + # attempting to reinstall npm is broken on Raspbian 9 - name: Check for Sugarizer already installed stat: diff --git a/vars/ubuntu-18.yml b/vars/ubuntu-18.yml index 02f4d2355..70c472080 100644 --- a/vars/ubuntu-18.yml +++ b/vars/ubuntu-18.yml @@ -17,6 +17,6 @@ systemctl_program: /bin/systemctl mysql_service: mysql apache_log: /var/log/apache2/access.log sshd_service: ssh -php_version: 7.1 +php_version: 7.2 postgresql_version: 9.6 systemd_location: /lib/systemd/system From 5c0486b3ea713a5d764174d548ce9eff44ce1e8b Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sat, 28 Apr 2018 18:50:14 +0000 Subject: [PATCH 2/7] do not change what is not tested --- roles/nextcloud/tasks/main.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index ece214e7d..c1e24c4be 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -56,9 +56,14 @@ - "php{{ php_version }}-mysql" - "php{{ php_version }}-curl" - "php{{ php_version }}-intl" - # - "php{{ php_version }}-mcrypt" - - "mcrypt" - when: is_debuntu + - "php{{ php_version }}-mcrypt" + when: is_debuntu and not is_ubuntu_18 + +- name: In Ubuntu 18, php dropped mcrypt + package: + name: mcrypt + state: present + when: is_ubuntu_18 # we need to install the rpm in order to get the dependencies # but we only need to do this the first time From d4cdf372d383ebbbbc91c62d235c94d288a75c8b Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 27 Apr 2018 03:54:27 +0000 Subject: [PATCH 3/7] just to get initial run. not function tested (nextcloud) --- roles/nextcloud/tasks/main.yml | 3 ++- roles/sugarizer/tasks/main.yml | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index b54fe9669..ece214e7d 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -56,7 +56,8 @@ - "php{{ php_version }}-mysql" - "php{{ php_version }}-curl" - "php{{ php_version }}-intl" - - "php{{ php_version }}-mcrypt" + # - "php{{ php_version }}-mcrypt" + - "mcrypt" when: is_debuntu # we need to install the rpm in order to get the dependencies diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index e75c871c8..f9bc95a11 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -40,6 +40,14 @@ - nodejs - npm +- name: Install npm (ubuntu-18) + package: + name: "{{ item }}" + state: present + when: internet_available and is_ubuntu_18 + with_items: + - npm + # attempting to reinstall npm is broken on Raspbian 9 - name: Check for Sugarizer already installed stat: From 3a461856552a6c79b1ad5ecfed821b4149c51046 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sat, 28 Apr 2018 18:50:14 +0000 Subject: [PATCH 4/7] do not change what is not tested --- roles/nextcloud/tasks/main.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index ece214e7d..c1e24c4be 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -56,9 +56,14 @@ - "php{{ php_version }}-mysql" - "php{{ php_version }}-curl" - "php{{ php_version }}-intl" - # - "php{{ php_version }}-mcrypt" - - "mcrypt" - when: is_debuntu + - "php{{ php_version }}-mcrypt" + when: is_debuntu and not is_ubuntu_18 + +- name: In Ubuntu 18, php dropped mcrypt + package: + name: mcrypt + state: present + when: is_ubuntu_18 # we need to install the rpm in order to get the dependencies # but we only need to do this the first time From f9278428a0160d3dd006a5c2ebbc5af6f89bceb6 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 28 Apr 2018 15:45:08 -0500 Subject: [PATCH 5/7] rework mcrypt logic --- roles/nextcloud/tasks/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index c1e24c4be..3252efa43 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -56,14 +56,13 @@ - "php{{ php_version }}-mysql" - "php{{ php_version }}-curl" - "php{{ php_version }}-intl" - - "php{{ php_version }}-mcrypt" - when: is_debuntu and not is_ubuntu_18 + when: is_debuntu -- name: In Ubuntu 18, php dropped mcrypt +- name: In php7.2, php dropped mcrypt package: - name: mcrypt + name: "php{{ php_version }}-mcrypt" state: present - when: is_ubuntu_18 + when: is_debuntu and not is_ubuntu_18 # we need to install the rpm in order to get the dependencies # but we only need to do this the first time From 5486a4eb58c232027079486f2493d1f45f2175f9 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 28 Apr 2018 15:48:01 -0500 Subject: [PATCH 6/7] don't enable nodejs_6.x on ubuntu-18 --- roles/sugarizer/tasks/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml index f9bc95a11..3f1733806 100644 --- a/roles/sugarizer/tasks/main.yml +++ b/roles/sugarizer/tasks/main.yml @@ -21,7 +21,7 @@ - name: Set up Node.js 6.x apt sources (debuntu) shell: curl -sL https://deb.nodesource.com/setup_6.x | bash - - when: internet_available and is_debuntu + when: internet_available and is_debuntu and not ubuntu-18 - name: Install latest Node.js which includes /usr/bin/npm (debuntu) package: @@ -29,7 +29,7 @@ state: latest # package: name=nodejs=6.* # state=present - when: internet_available and is_debuntu + when: internet_available and is_debuntu and not ubuntu-18 - name: Install npm (OS's other than debuntu) package: @@ -43,10 +43,11 @@ - name: Install npm (ubuntu-18) package: name: "{{ item }}" - state: present + state: latest when: internet_available and is_ubuntu_18 with_items: - npm + - nodejs # attempting to reinstall npm is broken on Raspbian 9 - name: Check for Sugarizer already installed From b12b6d5638f65490b9bd6ecfa4a5fa7aced48489 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 28 Apr 2018 22:50:59 -0500 Subject: [PATCH 7/7] narrow is_F18 --- roles/0-init/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 01d391d65..c731a6a6a 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -144,7 +144,7 @@ mysql_service: mysqld no_NM_reload: True is_F18: True - when: ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18" + when: (ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18") and ansible_distribution == "Fedora" - name: Set mysql_service to mysql (debuntu) set_fact: