From 5e13f8da4ef28d6886948546ff4fb8994b1f2a47 Mon Sep 17 00:00:00 2001 From: Mathieu Trossevin Date: Fri, 5 Jun 2020 12:09:19 +0200 Subject: [PATCH] lxc-php: Make mysql socket binding work on fresh install /var/run/mysqld only exist after mysql is installed, as such the role lxc-php need to run after the role mysql. Also only cause a restart of the containers when their configuration has been changed. For now socket binding might only work for mysql and not mysql-oracle (it's default socket seems to be /tmp/mysql.sock). --- lxc-php/tasks/misc.yml | 7 +++++++ packweb-apache/meta/main.yml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lxc-php/tasks/misc.yml b/lxc-php/tasks/misc.yml index b643bb4a..582c4170 100644 --- a/lxc-php/tasks/misc.yml +++ b/lxc-php/tasks/misc.yml @@ -29,3 +29,10 @@ container_config: - "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 + register: added_mysql_socket + +- name: "{{ lxc_php_version }} - Restart container as configuration changed" + lxc_container: + name: "{{ lxc_php_version }}" + state: restarted + when: added_mysql_socket.changed diff --git a/packweb-apache/meta/main.yml b/packweb-apache/meta/main.yml index c8981b6e..f98442a6 100644 --- a/packweb-apache/meta/main.yml +++ b/packweb-apache/meta/main.yml @@ -21,11 +21,11 @@ dependencies: - { role: evolix/apache } - { role: evolix/php, php_apache_enable: True, when: packweb_apache_modphp } - { role: evolix/php, php_fpm_enable: True, when: packweb_apache_fpm } - - { role: evolix/lxc-php, lxc_php_version: php56, when: "'php56' in packweb_multiphp_versions" } - - { role: evolix/lxc-php, lxc_php_version: php70, when: "'php70' in packweb_multiphp_versions" } - - { role: evolix/lxc-php, lxc_php_version: php73, when: "'php73' in packweb_multiphp_versions" } - { role: evolix/squid, squid_localproxy_enable: True } - { role: evolix/mysql, when: packweb_mysql_variant == "debian" } - { role: evolix/mysql-oracle, when: packweb_mysql_variant == "oracle" } + - { role: evolix/lxc-php, lxc_php_version: php56, when: "'php56' in packweb_multiphp_versions" } + - { role: evolix/lxc-php, lxc_php_version: php70, when: "'php70' in packweb_multiphp_versions" } + - { role: evolix/lxc-php, lxc_php_version: php73, when: "'php73' in packweb_multiphp_versions" } - { role: evolix/webapps/evoadmin-web, evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}", evoadmin_multiphp_versions: "{{ packweb_multiphp_versions }}" } - { role: evolix/evoacme }