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

Compare commits

base: script:13d73c32d1f926590ea6a28910550d0fbf6e599c
Branches Tags
script:master
...
compare: script:eaaaa725446131d2fe84b5bafe214a7a3a90d630
Branches Tags
script:master

2 Commits
13d73c32d1 ... eaaaa72544

Author SHA1 Message Date
Christoph
eaaaa72544 Merge branch 'master' of https://git.oopen.de/script/apache2 2023-03-19 01:57:27 +01:00
Christoph
1170d6559e create_vhost.sh: chnage owner of 'DocumentRoot'/'Web Base directory' only if web vase directory does not exist. 2023-03-19 01:56:59 +01:00
1 changed files with 34 additions and 24 deletions
Show Stats Expand all files Collapse all files

58
create_vhost.sh
View File

@ -2401,6 +2401,7 @@ if [ ! -d "$_web_base_dir" ]; then
mkdir $_web_base_dir mkdir $_web_base_dir
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
echo_ok echo_ok
web_base_directory_already_exists=false
else else
echo_failed echo_failed
error "Cannot create web base directory \"$_web_base_dir\"." error "Cannot create web base directory \"$_web_base_dir\"."
@ -2408,22 +2409,27 @@ if [ ! -d "$_web_base_dir" ]; then
fi fi
else else
echo_skipped echo_skipped
web_base_directory_already_exists=true
fi fi
echononl "\tChange owner of Web Base directory \"$_web_base_dir\".." echononl "\tChange owner of Web Base directory \"$_web_base_dir\".."
if $_suEXEC ; then if $web_base_directory_already_exists ; then
chown -R ${suEXEC_user}:$suEXEC_group $_web_base_dir echo_skipped
elif [[ "$_type" = "PHP-FPM" ]]; then
chown -R ${unix_socket_owner}:${unix_socket_group} $_web_base_dir
else else
chown -R ${web_user}:${web_group} $_web_base_dir if $_suEXEC ; then
fi chown -R ${suEXEC_user}:$suEXEC_group $_web_base_dir
if [ "$?" = "0" ]; then elif [[ "$_type" = "PHP-FPM" ]]; then
echo_ok chown -R ${unix_socket_owner}:${unix_socket_group} $_web_base_dir
else else
echo_failed chown -R ${web_user}:${web_group} $_web_base_dir
error "Cannot change owner of web base directory \"$_web_base_dir\"" fi
fatal if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
error "Cannot change owner of web base directory \"$_web_base_dir\""
fatal
fi
fi fi
if $CREATE_SYMLINK_WEB_BASE_DIR ; then if $CREATE_SYMLINK_WEB_BASE_DIR ; then
@ -2462,19 +2468,23 @@ else
fi fi
echononl "\tChange owner of \"DocumentRoot\" directory.." echononl "\tChange owner of \"DocumentRoot\" directory.."
if $_suEXEC ; then if $web_base_directory_already_exists ; then
chown -R ${suEXEC_user}:$suEXEC_group $_doc_root echo_skipped
elif [[ "$_type" = "PHP-FPM" ]]; then
chown -R ${unix_socket_owner}:${unix_socket_group} $_doc_root
else else
chown -R ${web_user}:${web_group} $_doc_root if $_suEXEC ; then
fi chown -R ${suEXEC_user}:$suEXEC_group $_doc_root
if [ "$?" = "0" ]; then elif [[ "$_type" = "PHP-FPM" ]]; then
echo_ok chown -R ${unix_socket_owner}:${unix_socket_group} $_doc_root
else else
echo_failed chown -R ${web_user}:${web_group} $_doc_root
error "Cannot change owner of directory \"$_doc_root\"" fi
fatal if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
error "Cannot change owner of directory \"$_doc_root\""
fatal
fi
fi fi
echononl "\tCreate Logfile directory.." echononl "\tCreate Logfile directory.."