Explorar o código

Add check WEB_TEMPLATE or PROXY_TEMPLATE

For PROXY_TEMPLATE the config file still got created even not set. Same thing happens for WEB_TEMPLATE
Jaap Marcus %!s(int64=4) %!d(string=hai) anos
pai
achega
95accc2bc0
Modificáronse 1 ficheiros con 11 adicións e 1 borrados
  1. 11 1
      bin/v-add-web-domain

+ 11 - 1
bin/v-add-web-domain

@@ -169,6 +169,11 @@ fi
 # Preparing domain variables
 prepare_web_domain_values
 
+if [ -z "$WEB_TEMPLATE" ]; then 
+    WEB_TEMPLATE='default'
+    update_user_value "$user" '$WEB_TEMPLATE' "default"
+fi
+
 # Adding web server config
 add_web_config "$WEB_SYSTEM" "$WEB_TEMPLATE.tpl"
 
@@ -180,7 +185,12 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
         PROXY_EXT="$PROXY_EXT,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp"
         PROXY_EXT="$PROXY_EXT,rtf,js,mp3,avi,mpeg,flv,html,htm"
     fi
-    add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl"
+    if [ -z "$PROXY_TEMPLATE" ]; then 
+        PROXY_TEMPLATE='default'
+        update_user_value "$user" '$PROXY_TEMPLATE' "default"
+    fi
+    
+    add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl" 
 fi