Prepare support for PHP 7.1

handlers/main.yml

@@ -3,5 +3,5 @@
 
 - name: "Restart PHP-FPM"
   service:
-    name: '{{ phpFpmService|default("php7.0-fpm") }}'
+    name: '{{ phpFpmService }}'
     state: 'restarted'

tasks/main.yml

@@ -11,6 +11,9 @@
 
 - block:
 
+  - include_tasks: 'variables.yml'
+    tags: 'always'
+
   - import_tasks: php.yml
 
   - name: "Link PhpEnMod for PHP 5.3"

tasks/oci-7.1.yml

+---
+# file: roles/php/tasks/oci-7.1.yml
+
+- debug: msg="OCI8 for PHP 7.1 not implemented yet"

tasks/php.yml

@@ -26,8 +26,9 @@
   when: php_version_main|default('7') != '7'
   ignore_errors: true
 
+# NOTE: If oauth is already installed and we install a new PHP 7 version then this fails and we need --force as well
 - name: "PHP | Install PECL packages"
-  shell: 'pecl install --soft oauth'
+  shell: 'pecl install --soft --force oauth'
   when: php_version_main|default('7') == '7'
   ignore_errors: true
 
@@ -158,7 +159,7 @@
 
 - block:
   - set_fact:
-      phpLogRotatePrefix='7.0'
+      phpLogRotatePrefix='{{php_version|default("7.0")}}'
       phpLibPrefix=''
     when: php_version_main|default('7') == '7'
   - set_fact:

tasks/variables.yml

+---
+# file: roles/php/tasks/variables.yml
+
+- block:
+  - set_fact: phpFpmService='php5-fpm'
+  - set_fact: phpFpmService='php-fpm'
+    when: php_version_main|default('7') == '5'
+  - set_fact: phpFpmService='php{{php_version|default("7.0")}}-fpm'
+    when: php_version_main|default('7') == '7'
+  tags: 'always'