diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 2d0f02f..b5cf47a 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -110,6 +110,8 @@ global_interfaces_directory: "/etc/network/interfaces.d" global_log_directory: "/var/log" +global_mysql_socket_path: "/var/run/mysqld/mysqld.sock" + global_nfs_port: "2049" # for version 4 global_nfs_directory: "{{ global_webservers_directory }}/nfs" diff --git a/roles/mysql/application/tasks/main.yml b/roles/mysql/application/tasks/main.yml index 2f62f72..0909897 100644 --- a/roles/mysql/application/tasks/main.yml +++ b/roles/mysql/application/tasks/main.yml @@ -21,7 +21,7 @@ user: "root" password: "{{ mysql_root_password }}" host: "localhost" - login_unix_socket: /var/run/mysqld/mysqld.sock + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" @@ -30,7 +30,7 @@ user: "" host_all: yes state: absent - login_unix_socket: /var/run/mysqld/mysqld.sock + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" @@ -39,7 +39,7 @@ user: "root" password: "{{ mysql_root_password }}" host: "::1" - login_unix_socket: /var/run/mysqld/mysqld.sock + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" @@ -48,7 +48,7 @@ user: "root" password: "{{ mysql_root_password }}" host: "127.0.0.1" - login_unix_socket: /var/run/mysqld/mysqld.sock + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" @@ -57,7 +57,7 @@ user: "root" host: "{{ inventory_hostname }}" state: absent - login_unix_socket: /var/run/mysqld/mysqld.sock + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" @@ -65,7 +65,7 @@ mysql_db: db: "test" state: absent - login_unix_socket: /var/run/mysqld/mysqld.sock + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" diff --git a/roles/mysql/database/tasks/import.yml b/roles/mysql/database/tasks/import.yml index 1ab1033..d29ca00 100644 --- a/roles/mysql/database/tasks/import.yml +++ b/roles/mysql/database/tasks/import.yml @@ -16,7 +16,7 @@ state: import name: "{{ database_name }}" target: "{{ sql_temp.path }}" - login_unix_socket: "/var/run/mysqld/mysqld.sock" + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" diff --git a/roles/mysql/database/tasks/main.yml b/roles/mysql/database/tasks/main.yml index ac54ba3..9326852 100644 --- a/roles/mysql/database/tasks/main.yml +++ b/roles/mysql/database/tasks/main.yml @@ -10,14 +10,14 @@ password: "{{ database_pass }}" update_password: always priv: "{{ database_name }}.*:ALL" - login_unix_socket: "/var/run/mysqld/mysqld.sock" + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" - name: Create SQL database {{ database_name }} mysql_db: db: "{{ database_name }}" - login_unix_socket: "/var/run/mysqld/mysqld.sock" + login_unix_socket: "{{ global_mysql_socket_path }}" login_user: root login_password: "{{ mysql_root_password }}" register: create_database