Compare commits

..

No commits in common. "eaaaa725446131d2fe84b5bafe214a7a3a90d630" and "13d73c32d1f926590ea6a28910550d0fbf6e599c" have entirely different histories.

View File

@ -2401,7 +2401,6 @@ 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\"."
@ -2409,27 +2408,22 @@ 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 $web_base_directory_already_exists ; then if $_suEXEC ; then
echo_skipped chown -R ${suEXEC_user}:$suEXEC_group $_web_base_dir
elif [[ "$_type" = "PHP-FPM" ]]; then
chown -R ${unix_socket_owner}:${unix_socket_group} $_web_base_dir
else else
if $_suEXEC ; then chown -R ${web_user}:${web_group} $_web_base_dir
chown -R ${suEXEC_user}:$suEXEC_group $_web_base_dir fi
elif [[ "$_type" = "PHP-FPM" ]]; then if [ "$?" = "0" ]; then
chown -R ${unix_socket_owner}:${unix_socket_group} $_web_base_dir echo_ok
else else
chown -R ${web_user}:${web_group} $_web_base_dir echo_failed
fi error "Cannot change owner of web base directory \"$_web_base_dir\""
if [ "$?" = "0" ]; then fatal
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
@ -2468,23 +2462,19 @@ else
fi fi
echononl "\tChange owner of \"DocumentRoot\" directory.." echononl "\tChange owner of \"DocumentRoot\" directory.."
if $web_base_directory_already_exists ; then if $_suEXEC ; then
echo_skipped chown -R ${suEXEC_user}:$suEXEC_group $_doc_root
elif [[ "$_type" = "PHP-FPM" ]]; then
chown -R ${unix_socket_owner}:${unix_socket_group} $_doc_root
else else
if $_suEXEC ; then chown -R ${web_user}:${web_group} $_doc_root
chown -R ${suEXEC_user}:$suEXEC_group $_doc_root fi
elif [[ "$_type" = "PHP-FPM" ]]; then if [ "$?" = "0" ]; then
chown -R ${unix_socket_owner}:${unix_socket_group} $_doc_root echo_ok
else else
chown -R ${web_user}:${web_group} $_doc_root echo_failed
fi error "Cannot change owner of directory \"$_doc_root\""
if [ "$?" = "0" ]; then fatal
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.."