Browse Source

Merge branch 'file-system-update' into mail-ssl

Kristan Kenney 7 years ago
parent
commit
28c08d37ad
1 changed files with 3 additions and 7 deletions
  1. 3 7
      func/domain.sh

+ 3 - 7
func/domain.sh

@@ -231,7 +231,7 @@ add_web_config() {
 
 
     if [[ "$2" =~ stpl$ ]]; then
     if [[ "$2" =~ stpl$ ]]; then
         rm -f /etc/$1/conf.d/domains/$domain.ssl.conf
         rm -f /etc/$1/conf.d/domains/$domain.ssl.conf
-        echo "include $conf;" > /etc/$1/conf.d/domains/$domain.ssl.conf
+        ln -s $conf /etc/$1/conf.d/domains/$domain.ssl.conf
 
 
         # Clear old configurations
         # Clear old configurations
         rm -rf $HOMEDIR/$user/conf/web/$domain.*
         rm -rf $HOMEDIR/$user/conf/web/$domain.*
@@ -239,16 +239,12 @@ add_web_config() {
         rm -rf $HOMEDIR/$user/conf/web/*nginx.$domain.*
         rm -rf $HOMEDIR/$user/conf/web/*nginx.$domain.*
     else
     else
         rm -f /etc/$1/conf.d/domains/$domain.conf
         rm -f /etc/$1/conf.d/domains/$domain.conf
-        echo "include $conf;" > /etc/$1/conf.d/domains/$domain.conf
+        ln -s $conf /etc/$1/conf.d/domains/$domain.conf
 
 
         # Clear old configurations
         # Clear old configurations
         rm -rf $HOMEDIR/$user/conf/web/$domain.*
         rm -rf $HOMEDIR/$user/conf/web/$domain.*
     fi
     fi
-
-    if [ "$1" != 'nginx' ]; then
-        find /etc/$1/conf.d/domains -type f -name "$domain.*"  | xargs sed -i "s/;//g"
-    fi
-
+    
     trigger="${2/.*pl/.sh}"
     trigger="${2/.*pl/.sh}"
     if [ -x "$WEBTPL/$1/$WEB_BACKEND/$trigger" ]; then
     if [ -x "$WEBTPL/$1/$WEB_BACKEND/$trigger" ]; then
         $WEBTPL/$1/$WEB_BACKEND/$trigger \
         $WEBTPL/$1/$WEB_BACKEND/$trigger \