From 8331f98490978eeabdd2eca848d9bed4bec1c6e6 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Sat, 21 Mar 2020 16:56:57 +0100
Subject: [PATCH] Drupal: Fix some obsoleted parts, ad php-fpm as dependency,
 fix the php packages list.

---
 library/roles/drupal-org/defaults/main.yml | 13 +++++++++----
 library/roles/drupal-org/meta/main.yml     |  1 +
 library/roles/drupal-org/tasks/drush.yml   |  4 ++--
 library/roles/drupal-org/vars/main.yml     |  2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 library/roles/drupal-org/vars/main.yml

diff --git a/library/roles/drupal-org/defaults/main.yml b/library/roles/drupal-org/defaults/main.yml
index 2e4ffb1b..b720600f 100644
--- a/library/roles/drupal-org/defaults/main.yml
+++ b/library/roles/drupal-org/defaults/main.yml
@@ -2,8 +2,11 @@
 drupal_install: False
 drupal_install_deb: False
 drupal_maintenance_cron: False
-drupal_major: 8
-drupal_version: '{{ drupal_major_ver }}.1.7'
+drupal_major_ver: 8
+drupal_major: '{{ drupal_major_ver }}'
+drupal_minor_ver: 8
+drupal_point_ver: 3
+drupal_version: '{{ drupal_major_ver }}.{{ drupal_minor_ver }}.{{ drupal_point_ver }}'
 drupal_dist_name: 'drupal-{{ drupal_version }}'
 drupal_dist_file: '{{ drupal_dist_name }}.tar.gz'
 drupal_tar_url: 'http://ftp.drupal.org/files/projects/{{ drupal_dist_file }}'
@@ -19,6 +22,7 @@ http_group: '{{ http_user }}'
 #  - 'php{{ php_version }}-mbstring'
 #  - php-ssh2
 drupal_php_prereq:
+  - 'php{{ php_version }}-fpm'
   - 'php{{ php_version }}-json'
   - 'php{{ php_version }}-intl'
   - 'php{{ php_version }}-cli'
@@ -26,10 +30,11 @@ drupal_php_prereq:
   - 'php{{ php_version }}-gd'
   - 'php{{ php_version }}-json'
   - 'php{{ php_version }}-curl'
-  - php-apc
+  - 'php{{ php_version }}-mbstring'
+  - php-apcu
   - php-pear
   - php-date
-  - php-xml-serializer
+  - php-memcached
   - imagemagick
 
 drupal_install_drush: False
diff --git a/library/roles/drupal-org/meta/main.yml b/library/roles/drupal-org/meta/main.yml
index 05a6e2b4..0ea5052c 100644
--- a/library/roles/drupal-org/meta/main.yml
+++ b/library/roles/drupal-org/meta/main.yml
@@ -1,4 +1,5 @@
 ---
 dependencies:
+  - { role: '../../library/roles/php-fpm' }
   - { role: '../../library/roles/composer', when: drupal_install_drush }
 
diff --git a/library/roles/drupal-org/tasks/drush.yml b/library/roles/drupal-org/tasks/drush.yml
index 1ca09ee8..8e8ffe7a 100644
--- a/library/roles/drupal-org/tasks/drush.yml
+++ b/library/roles/drupal-org/tasks/drush.yml
@@ -11,8 +11,8 @@
       tags: ['drupal', 'drush', 'global_drush' ]
 
     - name: Install drush locally as part of drupal
-      become: True
-      become_user: '{{ item.user }}'
+      #become: True
+      #become_user: '{{ item.user }}'
       composer: command=require arguments=drush/drush:{{ drupal_drush_version }} prefer_dist=yes working_dir={{ item.doc_root }}
       with_items: '{{ phpfpm_pools }}'
 
diff --git a/library/roles/drupal-org/vars/main.yml b/library/roles/drupal-org/vars/main.yml
new file mode 100644
index 00000000..8e4429ef
--- /dev/null
+++ b/library/roles/drupal-org/vars/main.yml
@@ -0,0 +1,2 @@
+---
+php_fpm_packages: '{{ drupal_php_prereq }}'