From 1ae91ffce0ef390d3032b71b5f6206f86376ea12 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 7 Sep 2018 10:25:57 +0200
Subject: [PATCH] Make sure we get the proper PHP CLI alternative inside Jails
---
tasks/updatejail.yml | 6 ++++++
templates/jk_init.ini | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/tasks/updatejail.yml b/tasks/updatejail.yml
index 8d90416..455aa97 100644
--- a/tasks/updatejail.yml
+++ b/tasks/updatejail.yml
@@ -28,6 +28,12 @@
value: '/usr/sbin/jk_chrootsh'
user: '{{ drupal.jail.name }}'
+ - name: "Ensure proper symlink for PHP executable in Jail"
+ file:
+ src: '/usr/bin/php{{ php_version }}'
+ dest: '{{ jailroot }}/{{ drupal.jail.name }}/etc/alternatives/php'
+ state: 'link'
+
tags:
- 'UpdateJails'
- 'shells'
diff --git a/templates/jk_init.ini b/templates/jk_init.ini
index c9bd7fc..41d446f 100644
--- a/templates/jk_init.ini
+++ b/templates/jk_init.ini
@@ -169,7 +169,7 @@ comment = the php interpreter and libraries
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
+executables = /usr/bin/php*
directories = /usr/lib/php, /usr/share/php, /usr/share/php{{php_version|default("7.0")}}-*, /etc/php, /usr/share/zoneinfo, /usr/lib/x86_64-linux-gnu/libxml*
{% else %}
executables = /usr/bin/php5
--
GitLab