script/apache2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: script:068c24135396bcbfbe9f9967c0096df54c19a260
Branches Tags
script:master
...
compare: script:master
Branches Tags
script:master

3 Commits
068c241353 ... master

Author SHA1 Message Date
christoph
5ec756adec handle_domain_on_webserver.sh: change default MySQL credentials. 2024-07-05 16:00:47 +02:00
Christoph
363e1176ff create_vhost.sh: Log directory in case of suexec.. 2024-04-29 17:48:03 +02:00
Christoph
1488743e63 create_vhost.sh: change how determin httpd binary. 2024-04-24 16:44:22 +02:00
3 changed files with 23 additions and 9 deletions
Expand all files Collapse all files

11
conf/handle_domain_on_webserver.conf.sample
View File

@ -110,10 +110,11 @@ DNS_MASTER_SERVER=""
# - $ mysql --login-path=local ... # - $ mysql --login-path=local ...
# - # -
# - Example # - Example
# - mysql_credential_args="--login-path=local" # - MYSQL_CREDENTIAL_ARGS="--login-path=local"
# - mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default) # - 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="--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"

19
create_vhost.sh
View File

@ -207,14 +207,25 @@ shopt -u extglob
# - Determin httpd binary # - 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 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 [ -z "$_httpd_binary" ]; then
if [ -x "/usr/local/apache2/bin/httpd" ]; then if [ -x "/usr/local/apache2/bin/httpd" ]; then
_httpd_binary="/usr/local/apache2/bin/httpd" _httpd_binary="/usr/local/apache2/bin/httpd"
fi fi
fi fi
fi fi
# - Determin websever user/group # - Determin websever user/group
@ -841,7 +852,9 @@ if [ -z "$_existing_vhost_config_file" ]; then
done 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" __log_dir="$COMMON_LOGFILE_DIR"
else else
__log_dir=${_web_base_dir}/logs __log_dir=${_web_base_dir}/logs

2
handle_domain_on_webserver.sh
View File

@ -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_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 "$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 fi