Update httpauth functions to new file paths

Author: Kristan Kenney

bin/v-add-web-domain-httpauth

@@ -22,8 +22,8 @@ source $HESTIA/func/domain.sh
 source $HESTIA/conf/hestia.conf
 
 # Defining htpasswd file
-htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess"
-htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"
+htaccess="$HOMEDIR/$user/conf/web/$domain/htaccess"
+htpasswd="$HOMEDIR/$user/conf/web/$domain/htpasswd"
 shtaccess="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf_htaccess"
 shtpasswd="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.htpasswd"
 docroot="$HOMEDIR/$user/web/$domain/public_html"

bin/v-change-web-domain-httpauth

@@ -21,7 +21,7 @@ source $HESTIA/func/domain.sh
 source $HESTIA/conf/hestia.conf
 
 # Defining htpasswd file
-htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"
+htpasswd="$HOMEDIR/$user/conf/web/$domain/htpasswd"
 
 
 #----------------------------------------------------------#

bin/v-delete-web-domain-httpauth

@@ -21,8 +21,8 @@ source $HESTIA/func/domain.sh
 source $HESTIA/conf/hestia.conf
 
 # Defining htpasswd file
-htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess"
-htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"
+htaccess="$HOMEDIR/$user/conf/web/$domain/htaccess"
+htpasswd="$HOMEDIR/$user/conf/web/$domain/htpasswd"
 shtaccess="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf_htaccess"
 shtpasswd="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.htpasswd"
 

func/rebuild.sh

@@ -326,8 +326,8 @@ rebuild_web_domain_conf() {
     done
 
     # Adding http auth protection
-    htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess"
-    htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"
+    htaccess="$HOMEDIR/$user/conf/web/$domain/htaccess"
+    htpasswd="$HOMEDIR/$user/conf/web/$domain/htpasswd"
     docroot="$HOMEDIR/$user/web/$domain/public_html"
     for auth_user in ${AUTH_USER//:/ }; do
         # Parsing auth user variables