From 5ec756adecad424d49bfbc61cb60b7450df2c3b6 Mon Sep 17 00:00:00 2001 From: christoph Date: Fri, 5 Jul 2024 16:00:47 +0200 Subject: [PATCH] handle_domain_on_webserver.sh: change default MySQL credentials. --- conf/handle_domain_on_webserver.conf.sample | 11 ++++++----- handle_domain_on_webserver.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/conf/handle_domain_on_webserver.conf.sample b/conf/handle_domain_on_webserver.conf.sample index 6667570..9fd0787 100644 --- a/conf/handle_domain_on_webserver.conf.sample +++ b/conf/handle_domain_on_webserver.conf.sample @@ -110,10 +110,11 @@ DNS_MASTER_SERVER="" # - $ mysql --login-path=local ... # - # - Example -# - mysql_credential_args="--login-path=local" -# - mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default) -# - mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf" +# - MYSQL_CREDENTIAL_ARGS="--login-path=local" +# - MYSQL_CREDENTIAL_ARGS="--defaults-file=/etc/mysql/debian.cnf" (Debian default) +# - MYSQL_CREDENTIAL_ARGS="--defaults-file=/usr/local/mysql/sys-maint.cnf" +# - MYSQL_CREDENTIAL_ARGS="-u root -S /run/mysqld/mysqld.sock" # - -# - Defaults to '--login-path=local' +# - Defaults to '-u root -S /run/mysqld/mysqld.sock' # - -#MYSQL_CREDENTIAL_ARGS="--login-path=local" +#MYSQL_CREDENTIAL_ARGS="-u root -S /run/mysqld/mysqld.sock" diff --git a/handle_domain_on_webserver.sh b/handle_domain_on_webserver.sh index 4e2bc89..bb1f913 100755 --- a/handle_domain_on_webserver.sh +++ b/handle_domain_on_webserver.sh @@ -207,7 +207,7 @@ if $delete_mode ; then [[ -n "$SCRIPT_remove_master_domain" ]] || SCRIPT_remove_master_domain="/root/bin/bind/bind_remove_domain_on_master.sh" [[ -n "$SCRIPT_remove_slave_domain" ]] || SCRIPT_remove_slave_domain="/root/bin/bind/bind_remove_domain_on_slave.sh" - [[ -n "$MYSQL_CREDENTIAL_ARGS" ]] || MYSQL_CREDENTIAL_ARGS="--login-path=local" + [[ -n "$MYSQL_CREDENTIAL_ARGS" ]] || MYSQL_CREDENTIAL_ARGS="-u root -S /run/mysqld/mysqld.sock" fi