From 4eb96e8375621475ef24a9a0de2c17c8aae00671 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
---
tasks/jailkit.yml | 4 ++--
templates/jk_init.ini | 2 +-
templates/php.ini | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tasks/jailkit.yml b/tasks/jailkit.yml
index 9e8552d..8250a7b 100644
--- a/tasks/jailkit.yml
+++ b/tasks/jailkit.yml
@@ -6,9 +6,9 @@
- block:
- set_fact: phpFpmService='php5-fpm'
- set_fact: phpFpmService='php-fpm'
- when: php_version|default('5.5') == '5.3'
+ when: php_version_main|default('7') == '5'
- set_fact: phpFpmService='php7.0-fpm'
- when: php_version|default('5.5') == '7'
+ when: php_version_main|default('7') == '7'
tags: 'always'
- name: "Reset Permissions in User Homes"
diff --git a/templates/jk_init.ini b/templates/jk_init.ini
index 08c8963..41a5032 100644
--- a/templates/jk_init.ini
+++ b/templates/jk_init.ini
@@ -168,7 +168,7 @@ comment = the php interpreter and libraries
{% if php_version|default('5.5') == '5.3' %}
executables = /usr/local/bin/php
directories = /usr/lib/php5, /usr/share/php, /usr/share/php5, /etc/php5, /usr/share/zoneinfo, /usr/local/lib/php/extensions
-{% elif php_version|default('5.5') == '7' %}
+{% elif php_version_main|default('7') == '7' %}
executables = /usr/bin/php
directories = /usr/lib/php, /usr/share/php, /usr/share/php7.0-*, /etc/php, /usr/share/zoneinfo
{% else %}
diff --git a/templates/php.ini b/templates/php.ini
index 878d345..d02edcd 100644
--- a/templates/php.ini
+++ b/templates/php.ini
@@ -1970,7 +1970,7 @@ ldap.max_links = -1
[Syslog]
define_syslog_variables = Off
-{% if php_version|default('5.5') == '7' %}
+{% if php_version_main|default('7') == '7' %}
[oauth]
extension=oauth.so
{% endif %}
--
GitLab