Merge branch 'master' of https://git.oopen.de/script/apache2

create_vhost.sh

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