handle_domain_on_webserver.sh: change default MySQL credentials.

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"

create_vhost.sh

@@ -207,14 +207,25 @@ shopt -u extglob
 
 # - Determin httpd binary
 # -
-_httpd_binary="`which httpd`"
+## - Determin httpd binary
+## -
+_httpd_binary="$(ps -axu | grep httpd \
+      | grep -e "^root" \
+      | grep -v grep \
+      | grep -v  vim \
+      | grep -v bash \
+      | awk '{print$11}' | head -1)"
+
 if [ -z "$_httpd_binary" ]; then
-   _httpd_binary="$(ps -axu | grep httpd |  grep -e "^root" | grep -v grep | awk '{print$11}')"
+
+   _httpd_binary="$(which httpd)"
+
    if [ -z "$_httpd_binary" ]; then
       if [ -x "/usr/local/apache2/bin/httpd" ]; then
          _httpd_binary="/usr/local/apache2/bin/httpd"
       fi
    fi
+
 fi
 
 # - Determin websever user/group
@@ -841,7 +852,9 @@ if [ -z "$_existing_vhost_config_file" ]; then
       done
 
 
-      if [[ -n "$(trim $COMMON_LOGFILE_DIR)" ]]; then
+      if $_suEXEC ; then
+         __log_dir=${_web_base_dir}/logs
+      elif [[ -n "$(trim $COMMON_LOGFILE_DIR)" ]]; then
          __log_dir="$COMMON_LOGFILE_DIR"
       else
          __log_dir=${_web_base_dir}/logs

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