From 49b20f9b126a2a9344446656c1b732b817f980bc Mon Sep 17 00:00:00 2001 From: Mathieu Trossevin Date: Fri, 5 Jun 2020 09:37:43 +0200 Subject: [PATCH] lxc-php: Have mysqld.sock inside of a directory Bind mount don't seems to work on a file so the default socket is now always named mysqld.sock and the configurable variable is php_conf_mysql_socket_dir that define the directory the socket will be in. --- lxc-php/defaults/main.yml | 3 ++- lxc-php/tasks/misc.yml | 5 ++--- lxc-php/templates/z-evolinux-defaults.ini.j2 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lxc-php/defaults/main.yml b/lxc-php/defaults/main.yml index bacd7635..a76e1a5b 100644 --- a/lxc-php/defaults/main.yml +++ b/lxc-php/defaults/main.yml @@ -8,7 +8,8 @@ php_conf_allow_url_fopen: "Off" php_conf_disable_functions: "exec,shell-exec,system,passthru,popen" # Allows accessing a local mysql database using localhost -php_conf_mysql_default_socket: Null +php_conf_mysql_socket_dir: Null +php_conf_mysql_default_socket: "{{ php_conf_mysql_socket_dir }}/mysqld.sock" lxc_php_version: Null diff --git a/lxc-php/tasks/misc.yml b/lxc-php/tasks/misc.yml index 30565c9c..b643bb4a 100644 --- a/lxc-php/tasks/misc.yml +++ b/lxc-php/tasks/misc.yml @@ -27,6 +27,5 @@ lxc_container: name: "{{ lxc_php_version }}" container_config: - - "lxc.mount.entry = /var/run/mysqld/mysqld {{ php_conf_mysql_default_socket | replace('/', '', 1) }} none bind,create=file 0 0" - state: restarted - when: php_conf_mysql_default_socket is string + - "lxc.mount.entry = /var/run/mysqld {{ php_conf_mysql_socket_dir | replace('/', '', 1) }} none bind,create=dir 0 0" + when: php_conf_mysql_socket_dir is string diff --git a/lxc-php/templates/z-evolinux-defaults.ini.j2 b/lxc-php/templates/z-evolinux-defaults.ini.j2 index b407e520..3bc6e4ee 100644 --- a/lxc-php/templates/z-evolinux-defaults.ini.j2 +++ b/lxc-php/templates/z-evolinux-defaults.ini.j2 @@ -7,7 +7,7 @@ html_errors = {{ php_conf_html_errors }} allow_url_fopen = {{ php_conf_allow_url_fopen }} disable_functions = {{ php_conf_disable_functions }} -{% if php_conf_mysql_default_socket %} +{% if php_conf_mysql_socket_dir %} [Pdo_mysql] pdo_mysql.default_socket = {{ php_conf_mysql_default_socket }}