Merge pull request #478 from opendevshop/ops/php/versions

Ops / PHP / Versions: Include geerlingguy.php versions and set default variable.

playbook.yml

@@ -5,13 +5,18 @@
 ---
 - hosts: all
   user: root
+  vars:
+    php_version: '7.2'
+    php_default_version_debian: '7.2'
+
   roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+
     - opendevshop.users
     - opendevshop.apache
     - geerlingguy.php-versions
     - geerlingguy.php
     - geerlingguy.php-mysql
     - geerlingguy.composer
     - opendevshop.devmaster
-  vars:
-    php_version: "7.1"

requirements.yml

@@ -7,6 +7,12 @@
 - name: geerlingguy.php
   version: 3.7.0
 
+- name: geerlingguy.php-versions
+  version: 4.0.2
+
+- name: geerlingguy.repo-remi
+  version: 1.2.0
+
 - name: geerlingguy.git
   version: 2.0.4
 

roles/.ansible-lint

@@ -1,6 +1,7 @@
 skip_list:
   - '302'
   - '303'
+  - '306'
 exclude_paths:
    - ./geerlingguy.apache
    - ./geerlingguy.composer

roles/opendevshop.devmaster/tasks/main.yml

@@ -181,6 +181,10 @@
     mode: 0755
   with_items: "{{ aegir_log_files_touch }}"
 
+- name: Confirm PHP version is correct.
+  shell: php -v | grep -F '{{ php_version }}'
+  changed_when: false
+
 # CentOS started failing tests because the PHP CLI was throwing Warnings about date.timezone missing.
 # @TODO: Investigate php.ini for CLI on all OS
 # - name: 'RedHat: Set timezone in PHP.ini for CLI.'

roles/opendevshop.users/defaults/main.yml

@@ -25,6 +25,3 @@ ssh_known_hosts:
   - bitbucket.org
   - drupal.org
   - gitlab.com
-
-php_version: "7.1"
-php_default_version_debian: "{{ php_version }}"