فهرست منبع

BugFix: When using nginx as proxy for apache, editing web alias would remove domain configs from apache2 conf.d folder

- del_web_config should remove only selected config (web or proxy, http or https) not all of them

since add_web_config creates a single config file
Robert Zollner 6 سال پیش
والد
کامیت
9bf6b7f8f0
1فایلهای تغییر یافته به همراه9 افزوده شده و 9 حذف شده
  1. 9 9
      func/domain.sh

+ 9 - 9
func/domain.sh

@@ -294,27 +294,27 @@ replace_web_config() {
 # Delete web configuration
 # Delete web configuration
 del_web_config() {
 del_web_config() {
     conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
     conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
+    local confname="$domain.conf"
     if [[ "$2" =~ stpl$ ]]; then
     if [[ "$2" =~ stpl$ ]]; then
         conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
         conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
+        confname="$domain.ssl.conf"
     fi
     fi
 
 
     # Remove domain configuration files and clean up symbolic links
     # Remove domain configuration files and clean up symbolic links
-    if [ ! -z "$WEB_SYSTEM" ]; then
-        rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.conf
-        rm -f /etc/$WEB_SYSTEM/conf.d/domains/$domain.ssl.conf
+    if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" = "$1" ]; then
+        rm -f "/etc/$WEB_SYSTEM/conf.d/domains/$confname"
     fi
     fi
-    if [ ! -z "$PROXY_SYSTEM" ]; then
-        rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.conf 
-        rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$domain.ssl.conf 
+    if [ ! -z "$PROXY_SYSTEM" ] && [ "$PROXY_SYSTEM" = "$1" ]; then
+        rm -f "/etc/$PROXY_SYSTEM/conf.d/domains/$confname"
     fi
     fi
 
 
     # Clean up legacy configuration files
     # Clean up legacy configuration files
     if [ ! -e "$conf" ]; then
     if [ ! -e "$conf" ]; then
-        conf="$HOMEDIR/$user/conf/web/$1.conf"
+        local legacyconf="$HOMEDIR/$user/conf/web/$1.conf"
         if [[ "$2" =~ stpl$ ]]; then
         if [[ "$2" =~ stpl$ ]]; then
-            conf="$HOMEDIR/$user/conf/web/s$1.conf"
+            legacyconf="$HOMEDIR/$user/conf/web/s$1.conf"
         fi
         fi
-        rm -f $conf
+        rm -f $legacyconf
 
 
         # Remove old global includes file
         # Remove old global includes file
         rm -f /etc/$1/conf.d/hestia.conf
         rm -f /etc/$1/conf.d/hestia.conf