Fix force SSL check for web domains

Author: Kristan Kenney

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

@@ -29,7 +29,6 @@ is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
 is_object_unsuspended 'web' 'DOMAIN' "$domain"
 
-
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
@@ -48,12 +47,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/$PROXY_SYSTEM.forcessl.conf"
+    forcessl="$HOMEDIR/$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/$WEB_SYSTEM.forcessl.conf"
+    forcessl="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.forcessl.conf"
 fi
 
 # Insert redirect commands
@@ -69,6 +68,9 @@ fi
 #                       Hestia                             #
 #----------------------------------------------------------#
 
+add_object_key "web" 'DOMAIN' "$domain" 'FORCESSL'
+update_object_value 'web' 'DOMAIN' "$domain" '$FORCESSL' 'yes'
+
 # Restart web server
 $BIN/v-restart-web
 check_result $? "Web restart failed" > /dev/null

bin/v-list-web-domain-ssl

@@ -134,12 +134,6 @@ if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
     ca=$(cat $USER_DATA/ssl/$domain.ca |sed ':a;N;$!ba;s/\n/\\n/g')
 fi
 
-# Check if force ssl is enabled
-forcessl="no"
-if ls /home/$user/conf/web/forcessl.*$domain*.conf 1> /dev/null 2>&1; then
-    forcessl="yes"
-fi
-
 # Listing data
 case $format in
     json)   json_list ;;