From fe601de121de53816227f9b908a6d05f83ffd2f9 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 28 Oct 2018 13:22:47 -0400
Subject: [PATCH] Update main.yml

---
 roles/nextcloud/tasks/main.yml | 66 +++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index af2930de5..f4eff569e 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -26,40 +26,39 @@
   tags:
     - download
 
-- name: Ubuntu and Debian treat names differently (Debian)
+# Ubuntu and Debian treat names differently
+- name: Install 3 php packages (debian)
   package:
-    name: "{{ item }}"
+    name:
+      - "libapache2-mod-php{{ php_version }}"
+      - "php{{ php_version }}-mbstring"
+      - "php{{ php_version }}-zip"
     state: present
-  with_items:
-    - "libapache2-mod-php{{ php_version }}"
-    - "php{{ php_version }}-mbstring"
-    - "php{{ php_version }}-zip"
   when: is_debian
 
-- name: Ubuntu and Debian treat names differently (Ubuntu)
+# Ubuntu and Debian treat names differently
+- name: Install 4 php packages (ubuntu)
   package:
-    name: "{{ item }}"
+    name:
+      - libapache2-mod-php
+      - php-imagick
+      - php-zip
+      - php-mbstring
     state: present
-  with_items:
-    - libapache2-mod-php
-    - php-imagick
-    - php-zip
-    - php-mbstring
   when: is_ubuntu
 
-- name: Install list of packages (debuntu)
+- name: Install 5 more php packages (debuntu)
   package:
-    name: "{{ item }}"
+    name:
+      - "php{{ php_version }}-gd"
+      - "php{{ php_version }}-json"
+      - "php{{ php_version }}-mysql"
+      - "php{{ php_version }}-curl"
+      - "php{{ php_version }}-intl"
     state: present
-  with_items:
-    - "php{{ php_version }}-gd"
-    - "php{{ php_version }}-json"
-    - "php{{ php_version }}-mysql"
-    - "php{{ php_version }}-curl"
-    - "php{{ php_version }}-intl"
   when: is_debuntu
 
-- name: In php7.2, php dropped mcrypt
+- name: In php7.2, php dropped mcrypt (debuntu but not ubuntu-18)
   package:
     name: "php{{ php_version }}-mcrypt"
     state: present
@@ -68,20 +67,19 @@
 # we need to install the rpm in order to get the dependencies
 # but we only need to do this the first time
 
-- name: Install list of packages (redhat)
+- name: Install 7 php packages (redhat)
   package:
-    name: "{{ item }}"
+    name:
+      - php
+      - php-gd
+      - php-json
+      - php-mysql
+      - php-curl
+      - php-intl
+      - php-mcrypt
+      # CentOS does not have a package for php-imagick
+      #- php-imagick
     state: present
-  with_items:
-    - php
-    - php-gd
-    - php-json
-    - php-mysql
-    - php-curl
-    - php-intl
-    - php-mcrypt
-# centos does not have a package for php-imagick
-#    - php-imagick
   when: is_redhat
 
 - name: Copy it to permanent location /opt (OS's other than Fedora 18)