Prepare support for PHP 7.1

tasks/jailkit.yml

@@ -3,12 +3,7 @@
 ---
 # file: roles/jailkit/tasks/jailkit.yml
 
-- block:
-  - set_fact: phpFpmService='php5-fpm'
-  - set_fact: phpFpmService='php-fpm'
-    when: php_version_main|default('7') == '5'
-  - set_fact: phpFpmService='php7.0-fpm'
-    when: php_version_main|default('7') == '7'
+- include_tasks: '../../php/tasks/variables.yml'
   tags: 'always'
 
 - name: "Reset Permissions in User Homes"

templates/jk_init.ini

@@ -170,7 +170,7 @@ 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_main|default('7') == '7' %}
 executables = /usr/bin/php
-directories = /usr/lib/php, /usr/share/php, /usr/share/php7.0-*, /etc/php, /usr/share/zoneinfo
+directories = /usr/lib/php, /usr/share/php, /usr/share/php{{php_version|default("7.0")}}-*, /etc/php, /usr/share/zoneinfo
 {% else %}
 executables = /usr/bin/php5
 directories = /usr/lib/php5, /usr/share/php, /usr/share/php5, /etc/php5, /usr/share/zoneinfo