Merge branch 'ubuntu-changes' of https://github.com/georgejhunt/iiab into ubuntu-changes

roles/nextcloud/tasks/main.yml

@@ -57,7 +57,13 @@
     - "php{{ php_version }}-curl"
     - "php{{ php_version }}-intl"
     - "php{{ php_version }}-mcrypt"
-  when: is_debuntu
+  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

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: