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,9 +2409,13 @@ 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 $web_base_directory_already_exists ; then
+   echo_skipped
+else
    if $_suEXEC ; then
       chown -R ${suEXEC_user}:$suEXEC_group $_web_base_dir
    elif [[ "$_type" = "PHP-FPM" ]]; then
@@ -2425,6 +2430,7 @@ else
       error "Cannot change owner of web base directory \"$_web_base_dir\""
       fatal
    fi
+fi
 
 if $CREATE_SYMLINK_WEB_BASE_DIR ; then
    echononl "\tCreate Symlink $_symlink_web_base_dir --> `basename $_web_base_dir`"
@@ -2462,6 +2468,9 @@ else
 fi
 
 echononl "\tChange owner of \"DocumentRoot\" directory.."
+if $web_base_directory_already_exists ; then
+   echo_skipped
+else
    if $_suEXEC ; then
       chown -R ${suEXEC_user}:$suEXEC_group $_doc_root
    elif [[ "$_type" = "PHP-FPM" ]]; then
@@ -2476,6 +2485,7 @@ else
       error "Cannot change owner of directory \"$_doc_root\""
       fatal
    fi
+fi
 
 echononl "\tCreate Logfile directory.."
 if [ ! -d "$_log_dir" ]; then