From bc8a4826ac55b671eeb529239ec00b495ee8cb1e Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 28 Sep 2017 14:14:13 +0100 Subject: [PATCH] templates: Configure galera socket per distribution openSUSE uses /var/run/mysql/mysql.sock instead of /var/run/mysqld/mysqld.sock so make this option distro configurable. Change-Id: I5a42bd5bdab1a89bfc1e39b6764a1380d8d98918 --- templates/my.cnf.j2 | 4 ++-- vars/redhat-7.yml | 1 + vars/suse-42.yml | 1 + vars/ubuntu-16.04.yml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/my.cnf.j2 b/templates/my.cnf.j2 index 18dc1f84..d9f117f2 100644 --- a/templates/my.cnf.j2 +++ b/templates/my.cnf.j2 @@ -10,11 +10,11 @@ [client] port = 3306 -socket = /var/run/mysqld/mysqld.sock +socket = "{{ galera_var_run_socket }}" [mysqld_safe] -socket = /var/run/mysqld/mysqld.sock +socket = "{{ galera_var_run_socket }}" nice = 0 log_error = /var/log/mysql_logs/galera_server_error.log diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 76c3dafe..db4d4a51 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -30,6 +30,7 @@ galera_server_required_distro_packages: galera_etc_conf_file: "/etc/mysql/my.cnf" galera_etc_include_dir: "/etc/mysql/conf.d" +galera_var_run_socket: "/var/run/mysqld/mysqld.sock" _galera_mariadb_server_package: "MariaDB-server" diff --git a/vars/suse-42.yml b/vars/suse-42.yml index af1350ca..9c35ce3e 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -29,6 +29,7 @@ galera_server_required_distro_packages: galera_etc_conf_file: "/etc/my.cnf" galera_etc_include_dir: "/etc/my.cnf.d" +galera_var_run_socket: "/var/run/mysql/mysql.sock" _galera_mariadb_server_package: "mariadb" diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 54fcd8db..83c256c0 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -41,6 +41,7 @@ galera_server_required_distro_packages: galera_etc_conf_file: "/etc/mysql/my.cnf" galera_etc_include_dir: "/etc/mysql/conf.d" +galera_var_run_socket: "/var/run/mysqld/mysqld.sock" # The package name for mariaDB is set as a variable # so that it can be used in debconf later in the