From 2c04d3bcc0d8b33c41b6dde103b1f9fc996530db Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 18 Jan 2018 15:17:24 +0100
Subject: [PATCH] Introduce php_version_main and make php_version always format
x.y
---
defaults/main.yml | 3 +++
tasks/{oci-7.yml => oci-7.0.yml} | 0
tasks/php.yml | 10 +++++-----
templates/etc-php5-apache2-php.ini | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
rename tasks/{oci-7.yml => oci-7.0.yml} (100%)
diff --git a/defaults/main.yml b/defaults/main.yml
index fdf31ee..892ccdf 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,6 @@
+php_version: '7.0'
+php_version_main: '7'
+
php_install_redis: true
php_hold_version: false
php_repositories: []
diff --git a/tasks/oci-7.yml b/tasks/oci-7.0.yml
similarity index 100%
rename from tasks/oci-7.yml
rename to tasks/oci-7.0.yml
diff --git a/tasks/php.yml b/tasks/php.yml
index a5c981f..57de4ca 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -23,12 +23,12 @@
- name: "PHP | Install PECL packages"
shell: 'pecl install --soft imagick-3.3.0'
- when: php_version|default('5.5') != '7'
+ when: php_version_main|default('7') != '7'
ignore_errors: true
- name: "PHP | Install PECL packages"
shell: 'pecl install --soft oauth'
- when: php_version|default('5.5') == '7'
+ when: php_version_main|default('7') == '7'
ignore_errors: true
- name: "PHP | Ensure Apache config directory"
@@ -134,17 +134,17 @@
owner=root
group=root
mode='644'
- when: (php_version|default('5.5') == '7') and (jailkit is not defined or not jailkit)
+ when: (php_version_main|default('7') == '7') and (jailkit is not defined or not jailkit)
- block:
- set_fact:
phpLogRotatePrefix='7.0'
phpLibPrefix=''
- when: php_version|default('5.5') == '7'
+ when: php_version_main|default('7') == '7'
- set_fact:
phpLogRotatePrefix='5'
phpLibPrefix='5'
- when: php_version|default('5.5') != '7'
+ when: php_version_main|default('7') != '7'
- name: "Install logrotate script"
template:
diff --git a/templates/etc-php5-apache2-php.ini b/templates/etc-php5-apache2-php.ini
index ac69b8f..ae9ade3 100644
--- a/templates/etc-php5-apache2-php.ini
+++ b/templates/etc-php5-apache2-php.ini
@@ -1988,7 +1988,7 @@ extension=imagick.so
extension=xmlrpc.so
{% endif %}
-{% if php_version|default('5.5') == '7' %}
+{% if php_version_main|default('7') == '7' %}
[oauth]
extension=oauth.so
{% endif %}
--
GitLab