From 515e3e59cdd4fbe75c7fbba5517141315c6cb3cb Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 27 Apr 2018 03:54:27 +0000 Subject: [PATCH 1/2] 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/2] 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