Fix path name in v-*-web-domain-ssl-force

Author: Kristan Kenney

bin/v-add-mail-domain-ssl-force

@@ -46,14 +46,14 @@ fi
 # Check if proxy is active
 if [ ! -z "$PROXY_SYSTEM" ] || [ ! -z "$PROXY" ]; then
     if ! grep --quiet "forcessl" $HESTIA/data/templates/mail/nginx/default.tpl; then
-        $BIN/v-update-web-templates
+        $BIN/v-update-mail-templates
     fi
-    forcessl="/home/$user/conf/mail/$domain/forcessl.$PROXY_SYSTEM.conf"
+    forcessl="/home/$user/conf/mail/$domain/$PROXY_SYSTEM.forcessl.conf"
 else
     if ! grep --quiet "forcessl" $HESTIA/data/templates/mail/nginx/default.tpl; then
-        $BIN/v-update-web-templates
+        $BIN/v-update-mail-templates
     fi
-    forcessl="/home/$user/conf/mail/$domain/forcessl.$WEB_SYSTEM.conf"
+    forcessl="/home/$user/conf/mail/$domain/$WEB_SYSTEM.forcessl.conf"
 fi
 
 # Insert redirect commands

bin/v-add-web-domain-ssl-force

@@ -48,12 +48,12 @@ if [ ! -z "$PROXY_SYSTEM" ] || [ ! -z "$PROXY" ]; then
     if ! grep --quiet "forcessl" $HESTIA/data/templates/web/nginx/default.tpl; then
         $BIN/v-update-web-templates
     fi
-    forcessl="/home/$user/conf/web/$domain/forcessl.$PROXY_SYSTEM.conf"
+    forcessl="/home/$user/conf/web/$domain/$PROXY_SYSTEM.forcessl.conf"
 else
     if ! grep --quiet "forcessl" $HESTIA/data/templates/web/nginx/default.tpl; then
         $BIN/v-update-web-templates
     fi
-    forcessl="/home/$user/conf/web/$domain/forcessl.$WEB_SYSTEM.conf"
+    forcessl="/home/$user/conf/web/$domain/$WEB_SYSTEM.forcessl.conf"
 fi
 
 # Insert redirect commands

bin/v-delete-web-domain-ssl-force

@@ -38,7 +38,7 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
 eval $(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
 
 # Remove forcessl configs
-rm -f /home/$user/conf/web/$domain/forcessl.*.conf
+rm -f /home/$user/conf/web/$domain/$domain.forcessl.conf
 
 
 #----------------------------------------------------------#