From e33da7cb1fdf6b4fc13a77b2e164e45b02cd7cf8 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Tue, 4 Feb 2014 05:48:56 +0800
Subject: [PATCH 01/25] Create suphp.tpl

---
 install/rhel/templates/web/httpd/suphp.tpl | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 install/rhel/templates/web/httpd/suphp.tpl

diff --git a/install/rhel/templates/web/httpd/suphp.tpl b/install/rhel/templates/web/httpd/suphp.tpl
new file mode 100644
index 000000000..ff0b52398
--- /dev/null
+++ b/install/rhel/templates/web/httpd/suphp.tpl
@@ -0,0 +1,36 @@
+  <VirtualHost %ip%:%web_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %docroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    <IfModule itk.c>
+        AssignUserID %user% %group%
+    </IfModule>
+        <IfModule !mod_ruid2.c>
+                SuexecUserGroup %user% %group%
+        </IfModule>
+#        <IfModule mod_ruid2.c>
+#                RMode config
+#                RUidGid %user% %group%
+#                RGroups apache
+#        </IfModule>
+        <Directory %docroot%>
+                AllowOverride All
+                Options +Includes -Indexes
+                suPHP_Engine ON
+                suPHP_UserGroup %user% %group%
+        </Directory>
+    <Directory %home%/%user%/web/%domain%/stats>
+        AllowOverride All
+    </Directory>
+    Include /usr/local/vesta/data/users/%user%/conf/web/%web_system%.%domain%.conf*
+
+</VirtualHost>

From b6940a900cdd38b92ad4399f2e11b37c896e80b7 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Tue, 4 Feb 2014 05:52:14 +0800
Subject: [PATCH 02/25] Create suphp.stpl

---
 install/rhel/templates/web/httpd/suphp.stpl | 42 +++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 install/rhel/templates/web/httpd/suphp.stpl

diff --git a/install/rhel/templates/web/httpd/suphp.stpl b/install/rhel/templates/web/httpd/suphp.stpl
new file mode 100644
index 000000000..10a0ef0e7
--- /dev/null
+++ b/install/rhel/templates/web/httpd/suphp.stpl
@@ -0,0 +1,42 @@
+<VirtualHost %ip%:%web_ssl_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %docroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    SSLEngine on
+    SSLVerifyClient none
+    SSLCertificateFile %ssl_crt%
+    SSLCertificateKeyFile %ssl_key%
+    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+    
+    <IfModule itk.c>
+        AssignUserID %user% %group%
+    </IfModule>
+        <IfModule !mod_ruid2.c>
+                SuexecUserGroup %user% %group%
+        </IfModule>
+#        <IfModule mod_ruid2.c>
+#                RMode config
+#                RUidGid %user% %group%
+#                RGroups apache
+#        </IfModule>
+        <Directory %sdocroot%>
+                AllowOverride All
+                SSLRequireSSL
+                Options +Includes -Indexes
+                suPHP_Engine ON
+                suPHP_UserGroup %user% %group%
+        </Directory>
+    <Directory %home%/%user%/web/%domain%/stats>
+        AllowOverride All
+    </Directory>
+    Include /usr/local/vesta/data/users/%user%/conf/web/%web_system%.%domain%.conf*
+
+</VirtualHost>

From da527df5e6aa175a57351109f341be617881bf51 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Tue, 4 Feb 2014 05:55:11 +0800
Subject: [PATCH 03/25] Update suphp.stpl

---
 install/rhel/templates/web/httpd/suphp.stpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/rhel/templates/web/httpd/suphp.stpl b/install/rhel/templates/web/httpd/suphp.stpl
index 10a0ef0e7..c210d6751 100644
--- a/install/rhel/templates/web/httpd/suphp.stpl
+++ b/install/rhel/templates/web/httpd/suphp.stpl
@@ -3,7 +3,7 @@
     ServerName %domain_idn%
     %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
+    DocumentRoot %sdocroot%
     ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
     Alias /vstats/ %home%/%user%/web/%domain%/stats/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/

From be92d08e15dd15e2b6974c0db143d041dc25e367 Mon Sep 17 00:00:00 2001
From: lnamp <kevin@kevin-MacBook-Pro.local>
Date: Tue, 4 Feb 2014 04:56:41 +0800
Subject: [PATCH 04/25] change conf location

$HOMEDIR/$user/conf/  >>  $VESTA/data/users/$user/conf/
---
 bin/v-add-dns-domain                |   2 +-
 bin/v-add-dns-record                |  22 +++++-----------------
 bin/v-add-mail-account              |   2 +-
 bin/v-add-mail-account-alias        |   2 +-
 bin/v-add-mail-account-autoreply    |   6 +++---
 bin/v-add-mail-account-forward      |   4 ++--
 bin/v-add-mail-account-fwd-only     |   8 ++++----
 bin/v-add-mail-domain               |  22 +++++++++++-----------
 bin/v-add-mail-domain-antispam      |   2 +-
 bin/v-add-mail-domain-antivirus     |   2 +-
 bin/v-add-mail-domain-catchall      |   4 ++--
 bin/v-add-mail-domain-dkim          |   6 +++---
 bin/v-add-user                      |  18 +++++++++---------
 bin/v-add-web-domain                |   2 +-
 bin/v-add-web-domain-alias          |   8 ++++----
 bin/v-add-web-domain-proxy          |   4 ++--
 bin/v-add-web-domain-ssl            |  13 ++++++-------
 bin/v-add-web-domain-stats          |   4 ++--
 bin/v-backup-user                   |  21 +++++++++------------
 bin/v-change-dns-record             |  19 +------------------
 bin/v-change-mail-account-password  |   4 ++--
 bin/v-change-mail-account-quota     |   4 ++--
 bin/v-change-mail-domain-catchall   |   4 ++--
 bin/v-change-web-domain-ip          |   8 ++++----
 bin/v-change-web-domain-proxy-tpl   |   4 ++--
 bin/v-change-web-domain-sslcert     |  10 +++++-----
 bin/v-change-web-domain-sslhome     |   4 ++--
 bin/v-change-web-domain-stats       |   6 +++---
 bin/v-change-web-domain-tpl         |   6 +++---
 bin/v-check-user-password           | Bin 0 -> 9648 bytes
 bin/v-delete-dns-domain             |   2 +-
 bin/v-delete-dns-record             |   1 -
 bin/v-delete-mail-account           |   6 +++---
 bin/v-delete-mail-account-alias     |   2 +-
 bin/v-delete-mail-account-autoreply |   2 +-
 bin/v-delete-mail-account-forward   |   4 ++--
 bin/v-delete-mail-account-fwd-only  |   2 +-
 bin/v-delete-mail-domain            |   2 +-
 bin/v-delete-mail-domain-antispam   |   2 +-
 bin/v-delete-mail-domain-antivirus  |   2 +-
 bin/v-delete-mail-domain-catchall   |   2 +-
 bin/v-delete-mail-domain-dkim       |   2 +-
 bin/v-delete-user                   |   2 +-
 bin/v-delete-web-domain             |  20 ++++++++++----------
 bin/v-delete-web-domain-alias       |   8 ++++----
 bin/v-delete-web-domain-proxy       |   8 ++++----
 bin/v-delete-web-domain-ssl         |  10 +++++-----
 bin/v-delete-web-domain-stats       |   2 +-
 bin/v-list-sys-services             |  18 +++---------------
 bin/v-rebuild-web-domains           |  28 ++++++++++++++--------------
 bin/v-restore-user                  |  20 ++++++++++----------
 bin/v-suspend-mail-account          |   4 ++--
 bin/v-suspend-web-domain            |   8 ++++----
 bin/v-unsuspend-mail-account        |   4 ++--
 bin/v-unsuspend-mail-domain         |   2 +-
 bin/v-unsuspend-web-domain          |   8 ++++----
 bin/v-update-sys-ip                 |   3 +--
 bin/v-update-web-domain-stat        |   2 +-
 bin/v-update-web-templates          |   8 --------
 59 files changed, 175 insertions(+), 230 deletions(-)
 create mode 100755 bin/v-check-user-password

diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain
index 8224543e9..0a0d564d9 100755
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@@ -128,7 +128,7 @@ fi
 
 # Adding zone in named.conf
 named="zone \"$domain_idn\" {type master; file"
-named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
+named="$named \"$VESTA/data/users/$user/conf/dns/$domain.db\";};"
 echo "$named" >> $dns_conf
 
 # Updating domain dns zone
diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record
index 7562218de..6253ba2d4 100755
--- a/bin/v-add-dns-record
+++ b/bin/v-add-dns-record
@@ -33,20 +33,6 @@ source $VESTA/func/main.sh
 source $VESTA/func/domain.sh
 source $VESTA/conf/vesta.conf
 
-# Null priority for none MX/SRV records
-if [ "$rtype" != 'MX' ] && [ "$rtype" != 'SRV' ]; then
-    priority=''
-fi
-
-# Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record
-fqdn_type=$(echo $rtype | grep "[NS|CNAME|MX|PTR|SRV]")
-if [ ! -z "$fqdn_type" ]; then
-    trailing_dot=$(echo $dvalue | grep "\.$")
-    if [ -z $trailing_dot ]; then
-        dvalue="$dvalue."
-    fi
-fi
-
 
 #----------------------------------------------------------#
 #                    Verifications                         #
@@ -63,14 +49,16 @@ is_package_full 'DNS_RECORDS'
 get_next_dnsrecord
 validate_format 'id'
 is_object_new "dns/$domain" 'ID' "$id"
-is_dns_fqnd "$rtype" "$dvalue"
-is_dns_nameserver_valid "$domain" "$rtype" "$dvalue"
 
 
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
+if [ "$rtype" != 'MX' ] && [ "$rtype" != 'SRV' ]; then
+    priority=''
+fi
+
 # Adding record
 zone="$USER_DATA/dns/$domain.conf"
 dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' PRIORITY='$priority'"
@@ -79,7 +67,7 @@ echo "$dns_rec" >> $zone
 chmod 660 $zone
 
 # Sorting records
-sort_dns_records
+sort_dns_records 
 
 # Updating zone
 update_domain_zone
diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account
index 2c0d7ce8e..dbaf60a0c 100755
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@@ -55,7 +55,7 @@ else
 fi
 
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias
index 844e58051..0f57ead89 100755
--- a/bin/v-add-mail-account-alias
+++ b/bin/v-add-mail-account-alias
@@ -45,7 +45,7 @@ is_mail_new "$malias"
 
 # Adding exim alias
 str="$malias@$domain:$account@$domain"
-echo "$str" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+echo "$str" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply
index ab0e57b9e..c8177de5a 100755
--- a/bin/v-add-mail-account-autoreply
+++ b/bin/v-add-mail-account-autoreply
@@ -43,7 +43,7 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #                       Action                             #
 #----------------------------------------------------------#
 # Add exim autoreply
-echo -e "$autoreply" > $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
+echo -e "$autoreply" > $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
 
 # Set ownership and permissions
 if [ "$MAIL_SYSTEM" = 'exim' ]; then
@@ -52,8 +52,8 @@ fi
 if [ "$MAIL_SYSTEM" = 'exim4' ]; then
     mail_user=Debian-exim
 fi
-chown $mail_user:mail $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
-chmod 660 $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
+chown $mail_user:mail $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
+chmod 660 $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward
index f566c14fa..b6994a170 100755
--- a/bin/v-add-mail-account-forward
+++ b/bin/v-add-mail-account-forward
@@ -55,8 +55,8 @@ else
     fwd="$fwd,$forward"
 fi
 
-sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/^$account@$domain:/ d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "$account@$domain:$fwd" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-account-fwd-only b/bin/v-add-mail-account-fwd-only
index 9baffc14a..3746d45e2 100755
--- a/bin/v-add-mail-account-fwd-only
+++ b/bin/v-add-mail-account-fwd-only
@@ -48,10 +48,10 @@ fi
 #----------------------------------------------------------#
 
 # Adding account to fwd_only
-touch $HOMEDIR/$user/conf/mail/$domain/fwd_only
-check_fwd=$(grep "^$account$" $HOMEDIR/$user/conf/mail/$domain/fwd_only)
+touch $VESTA/data/users/$user/conf/mail/$domain/fwd_only
+check_fwd=$(grep "^$account$" $VESTA/data/users/$user/conf/mail/$domain/fwd_only)
 if [ -z "$check_fwd" ]; then
-    echo "$account" > $HOMEDIR/$user/conf/mail/$domain/fwd_only
+    echo "$account" > $VESTA/data/users/$user/conf/mail/$domain/fwd_only
 fi
 
 # Set ownership
@@ -61,7 +61,7 @@ fi
 if [ "$MAIL_SYSTEM" = 'exim4' ]; then
     mail_user=Debian-exim
 fi
-chown -R $mail_user:mail $HOMEDIR/$user/conf/mail/$domain/fwd_only
+chown -R $mail_user:mail $VESTA/data/users/$user/conf/mail/$domain/fwd_only
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain
index 1051567db..ed2f7cac7 100755
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@@ -44,22 +44,22 @@ is_package_full 'MAIL_DOMAINS'
 #----------------------------------------------------------#
 
 # Adding domain directory and necessary files
-mkdir $HOMEDIR/$user/conf/mail/$domain
+mkdir $VESTA/data/users/$user/conf/mail/$domain
 mkdir $HOMEDIR/$user/mail/$domain_idn
-touch $HOMEDIR/$user/conf/mail/$domain/aliases
-touch $HOMEDIR/$user/conf/mail/$domain/passwd
+touch $VESTA/data/users/$user/conf/mail/$domain/aliases
+touch $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 # Adding symlink
-ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/$domain_idn
+ln -s $VESTA/data/users/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/$domain_idn
 
 # Adding antispam protection
 if [ "$antispam" = 'yes' ]; then
-    touch $HOMEDIR/$user/conf/mail/$domain/antispam
+    touch $VESTA/data/users/$user/conf/mail/$domain/antispam
 fi
 
 # Adding antivirus protection
 if [ "$antivirus" = 'yes' ]; then
-    touch $HOMEDIR/$user/conf/mail/$domain/antivirus
+    touch $VESTA/data/users/$user/conf/mail/$domain/antivirus
 fi
 
 # Adding dkim
@@ -69,7 +69,7 @@ if [ "$dkim" = 'yes' ]; then
         -out $USER_DATA/mail/$domain.pub &>/dev/null
     chmod 660 $USER_DATA/mail/$domain.*
 
-    cp $USER_DATA/mail/$domain.pem $HOMEDIR/$user/conf/mail/$domain/dkim.pem
+    cp $USER_DATA/mail/$domain.pem $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
 
     # Adding dkim dns records
     check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
@@ -92,8 +92,8 @@ s="$s DATE='$DATE'"
 
 # Set permissions
 chmod 660 $USER_DATA/mail/$domain.*
-chmod 771 $HOMEDIR/$user/conf/mail/$domain
-chmod 660 $HOMEDIR/$user/conf/mail/$domain/*
+chmod 771 $VESTA/data/users/$user/conf/mail/$domain
+chmod 660 $VESTA/data/users/$user/conf/mail/$domain/*
 chmod 771 /etc/$MAIL_SYSTEM/domains/$domain_idn
 chmod 770 $HOMEDIR/$user/mail/$domain_idn
 
@@ -104,8 +104,8 @@ fi
 if [ "$MAIL_SYSTEM" = 'exim4' ]; then
     mail_user=Debian-exim
 fi
-chown -R $mail_user:mail $HOMEDIR/$user/conf/mail/$domain
-chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+chown -R $mail_user:mail $VESTA/data/users/$user/conf/mail/$domain
+chown -R dovecot:mail $VESTA/data/users/$user/conf/mail/$domain/passwd
 chown $user:mail $HOMEDIR/$user/mail/$domain_idn
 
 echo $s >> $USER_DATA/mail.conf
diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam
index e15b379e0..0acbdeb2f 100755
--- a/bin/v-add-mail-domain-antispam
+++ b/bin/v-add-mail-domain-antispam
@@ -40,7 +40,7 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$ANTISPAM'
 #----------------------------------------------------------#
 
 # Adding antispam flag
-touch $HOMEDIR/$user/conf/mail/$domain/antispam
+touch $VESTA/data/users/$user/conf/mail/$domain/antispam
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus
index 2f55abad6..5826550bc 100755
--- a/bin/v-add-mail-domain-antivirus
+++ b/bin/v-add-mail-domain-antivirus
@@ -40,7 +40,7 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS'
 #----------------------------------------------------------#
 
 # Adding antivirus flag
-touch $HOMEDIR/$user/conf/mail/$domain/antivirus
+touch $VESTA/data/users/$user/conf/mail/$domain/antivirus
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall
index 213feeb56..7094c0f04 100755
--- a/bin/v-add-mail-domain-catchall
+++ b/bin/v-add-mail-domain-catchall
@@ -41,8 +41,8 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$CATCHALL'
 #----------------------------------------------------------#
 
 # Adding catchall alias
-sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/*@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "*@$domain:$email" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim
index 8c4726c51..3ff9dcd25 100755
--- a/bin/v-add-mail-domain-dkim
+++ b/bin/v-add-mail-domain-dkim
@@ -47,9 +47,9 @@ openssl rsa -pubout -in $USER_DATA/mail/$domain.pem \
 chmod 660 $USER_DATA/mail/$domain.*
 
 # Adding dkim to config
-cp $USER_DATA/mail/$domain.pem $HOMEDIR/$user/conf/mail/$domain/dkim.pem
-chown exim:mail $HOMEDIR/$user/conf/mail/$domain/dkim.pem
-chmod 660 $HOMEDIR/$user/conf/mail/$domain/dkim.pem
+cp $USER_DATA/mail/$domain.pem $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
+chown exim:mail $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
+chmod 660 $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
 
 # Checking dns domain
 check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
diff --git a/bin/v-add-user b/bin/v-add-user
index 0bda5b0bb..eada30edf 100755
--- a/bin/v-add-user
+++ b/bin/v-add-user
@@ -73,13 +73,13 @@ fi
 echo "$user:$password" | /usr/sbin/chpasswd
 
 # Building directory tree
-mkdir $HOMEDIR/$user/conf
+#mkdir $HOMEDIR/$user/conf
 
 if [ ! -z "$WEB_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/web
+    mkdir $VESTA/data/users/$user/conf/web
     mkdir $HOMEDIR/$user/web
     mkdir $HOMEDIR/$user/tmp
-    chmod 751 $HOMEDIR/$user/conf/web
+    chmod 751 $VESTA/data/users/$user/conf/web
     chmod 751 $HOMEDIR/$user/web
     chmod 771 $HOMEDIR/$user/tmp
     chown $user:$user $HOMEDIR/$user/web
@@ -87,21 +87,21 @@ if [ ! -z "$WEB_SYSTEM" ]; then
 fi
 
 if [ ! -z "$MAIL_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/mail
+    mkdir $VESTA/data/users/$user/conf/mail
     mkdir $HOMEDIR/$user/mail
     chmod 751 $HOMEDIR/$user/mail
-    chmod 751 $HOMEDIR/$user/conf/mail
+    chmod 751 $VESTA/data/users/$user/conf/mail
 fi
 
 if [ ! -z "$DNS_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/dns
-    chmod 751 $HOMEDIR/$user/conf/dns
+    mkdir $VESTA/data/users/$user/conf/dns
+    chmod 751 $VESTA/data/users/$user/conf/dns
 fi 
 
 
 # Set permissions
-chmod a+x $HOMEDIR/$user
-chattr +i $HOMEDIR/$user/conf
+#chmod a+x $HOMEDIR/$user
+#chattr +i $HOMEDIR/$user/conf
 
 # Checking quota
 if [ ! -z "$DISK_QUOTA" ]; then
diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain
index 048da8ea8..9657b9ab0 100755
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@@ -78,7 +78,7 @@ group="$user"
 email="info@$domain"
 docroot="$HOMEDIR/$user/web/$domain/public_html"
 tpl_file="$WEBTPL/$WEB_SYSTEM/$template.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 
 # Adding web config
 add_web_config
diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias
index b8000d398..442cc2d0b 100755
--- a/bin/v-add-web-domain-alias
+++ b/bin/v-add-web-domain-alias
@@ -50,7 +50,7 @@ is_package_full 'WEB_ALIASES'
 # Parsing domain values
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Parsing domain aliases
@@ -69,7 +69,7 @@ add_web_config
 
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -77,13 +77,13 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 
     if [ "$SSL" = 'yes' ]; then
         tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         del_web_config
         add_web_config
     fi
diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy
index cd3d733ba..fb7ee277b 100755
--- a/bin/v-add-web-domain-proxy
+++ b/bin/v-add-web-domain-proxy
@@ -54,7 +54,7 @@ get_domain_values 'web'
 PROXY="$template"
 PROXY_EXT="$extentions"
 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Preparing domain values for the template substitution
@@ -74,7 +74,7 @@ fi
 # Checking ssl
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     add_web_config
 
     chown root:$user $conf
diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl
index ca44e1483..79a711144 100755
--- a/bin/v-add-web-domain-ssl
+++ b/bin/v-add-web-domain-ssl
@@ -36,7 +36,6 @@ source $VESTA/conf/vesta.conf
 check_args '3' "$#" 'USER DOMAIN SSL_DIR [SSL_HOME] [RESTART]'
 validate_format 'user' 'domain' 'ssl_dir'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
-is_system_enabled "$WEB_SSL" 'SSL_SUPPORT'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
@@ -62,7 +61,7 @@ chmod 660 $USER_DATA/ssl/$domain.*
 
 # Parsing domain values
 get_domain_values 'web'
-conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
 SSL_HOME="$ssl_home"
 ip=$(get_real_ip $IP)
@@ -77,11 +76,11 @@ chown root:$user $conf
 chmod 640 $conf
 
 # Adding certificate to user dir
-cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
-cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
-cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
+cp -f $USER_DATA/ssl/$domain.crt $VESTA/data/users/$user/conf/web/ssl.$domain.crt
+cp -f $USER_DATA/ssl/$domain.key $VESTA/data/users/$user/conf/web/ssl.$domain.key
+cp -f $USER_DATA/ssl/$domain.pem $VESTA/data/users/$user/conf/web/ssl.$domain.pem
 if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
+    cp -f $USER_DATA/ssl/$domain.ca $VESTA/data/users/$user/conf/web/ssl.$domain.ca
 fi
 
 # Running template trigger
@@ -97,7 +96,7 @@ fi
 
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     add_web_config
 
diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats
index 5d6056d18..4273b46ca 100755
--- a/bin/v-add-web-domain-stats
+++ b/bin/v-add-web-domain-stats
@@ -66,11 +66,11 @@ cat $WEBTPL/$type/$type.tpl |\
         -e "s/%home%/${HOMEDIR////\/}/g" \
         -e "s/%alias%/${aliases//,/ }/g" \
         -e "s/%alias_idn%/${aliases_idn//,/ }/g" \
-    > $HOMEDIR/$user/conf/web/$type.$domain.conf
+    > $VESTA/data/users/$user/conf/web/$type.$domain.conf
 
 if [ "$type" == 'awstats' ]; then
     rm -f /etc/awstats/$type.$domain_idn.conf
-    ln -s $HOMEDIR/$user/conf/web/$type.$domain.conf \
+    ln -s $VESTA/data/users/$user/conf/web/$type.$domain.conf \
         /etc/awstats/$type.$domain_idn.conf
 else
     mkdir -p /var/lib/webalizer
diff --git a/bin/v-backup-user b/bin/v-backup-user
index 2b73eb501..7ae1c5315 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -9,9 +9,6 @@
 #                    Variable&Function                     #
 #----------------------------------------------------------#
 
-# Importing system variables
-source /etc/profile
-
 # Argument defenition
 user=$1
 notify=${2-no}
@@ -168,14 +165,14 @@ then
 
         # WEB config
         tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-        conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
         get_web_config_brds
         sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf
 
         # SSL check
         if [ "$SSL" = 'yes' ]; then
             tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-            conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
             get_web_config_brds
             sed -n "$top_line,$bottom_line p" $conf > conf/s$WEB_SYSTEM.conf
         fi
@@ -183,27 +180,27 @@ then
         # Proxy config
         if [ ! -z "$PROXY" ]; then
             tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-            conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
             get_web_config_brds
             sed -n "$top_line,$bottom_line p" $conf > conf/$PROXY_SYSTEM.conf
 
         # SSL proxy config
         if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ] ; then
             tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-            conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
             get_web_config_brds
             sed -n "$top_line,$bottom_line p" $conf > conf/s$PROXY_SYSTEM.conf
             fi
         fi
 
         # Suplemental configs
-        for sconfig in $(ls $HOMEDIR/$user/conf/web/|grep ".$domain.conf"); do
-            cp $HOMEDIR/$user/conf/web/$sconfig conf/
+        for sconfig in $(ls $VESTA/data/users/$user/conf/web/|grep ".$domain.conf"); do
+            cp $VESTA/data/users/$user/conf/web/$sconfig conf/
         done
 
         # SSL Certificates
         if [ "$SSL" = 'yes' ] ; then
-            cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/
+            cp $VESTA/data/users/$user/conf/web/ssl.$domain.* conf/
             cp $USER_DATA/ssl/$domain.* vesta/
         fi
 
@@ -260,7 +257,7 @@ then
 
         # Backingup dns recods
         cp $USER_DATA/dns/$domain.conf vesta/$domain.conf
-        cp $HOMEDIR/$user/conf/dns/$domain.db conf/$domain.db
+        cp $VESTA/data/users/$user/conf/dns/$domain.db conf/$domain.db
     done
     if [ "$i" -eq 1 ]; then
         echo -e "$(date "+%F %T") $i domain"
@@ -301,7 +298,7 @@ then
 
         # Creating exim config
         cd $tmpdir/mail/$domain/
-        cp $HOMEDIR/$user/conf/mail/$domain/* conf/
+        cp $VESTA/data/users/$user/conf/mail/$domain/* conf/
 
         # Creating vesta config
         conf="$USER_DATA/mail.conf"
diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record
index 292aae705..0bb97028e 100755
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@@ -44,29 +44,12 @@ is_object_valid "dns/$domain" 'ID' "$id"
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Parsing domain config
+# Deleting old record
 line=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf)
 eval $line
-
-# Null priority for none MX/SRV records
 if [ "$TYPE" != 'MX' ] && [ "$TYPE" != 'SRV' ]; then
     priority=''
 fi
-
-# Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record
-fqdn_type=$(echo $TYPE | grep "[NS|CNAME|MX|PTR|SRV]")
-if [ ! -z "$fqdn_type" ]; then
-    trailing_dot=$(echo $dvalue | grep "\.$")
-    if [ -z $trailing_dot ]; then
-        dvalue="$dvalue."
-    fi
-fi
-
-# Additional verifications
-is_dns_fqnd "$TYPE" "$dvalue"
-is_dns_nameserver_valid "$domain" "$TYPE" "$dvalue"
-
-# Deleting old record
 sed -i "/^ID='$id'/d" $USER_DATA/dns/$domain.conf
 
 # Adding record
diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password
index 8b7b6c6b6..82fe1eafc 100755
--- a/bin/v-change-mail-account-password
+++ b/bin/v-change-mail-account-password
@@ -53,9 +53,9 @@ else
     md5=$(/usr/sbin/dovecotpw -s md5 -p "$password")
 fi
 
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota
index c8b736d9b..1326c7b21 100755
--- a/bin/v-change-mail-account-quota
+++ b/bin/v-change-mail-account-quota
@@ -43,9 +43,9 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 
 md5=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5')
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall
index 449e616f4..623536d5e 100755
--- a/bin/v-change-mail-domain-catchall
+++ b/bin/v-change-mail-domain-catchall
@@ -40,8 +40,8 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 #----------------------------------------------------------#
 
 # Change cathcall alias
-sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/*@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "*@$domain:$email" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip
index de88ca78b..6871a2608 100755
--- a/bin/v-change-web-domain-ip
+++ b/bin/v-change-web-domain-ip
@@ -46,7 +46,7 @@ is_ip_avalable
 get_domain_values 'web'
 ip=$(get_real_ip $ip)
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 old=$(get_real_ip $IP)
 new=$ip
 replace_web_config
@@ -54,21 +54,21 @@ replace_web_config
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     replace_web_config
 fi
 
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     replace_web_config
 fi
 
 # Checking SSL proxy
 if [ "$SSL" = 'yes' ] && [ ! -z "$PROXY" ]; then 
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     replace_web_config
 fi
 
diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl
index e276868b1..beb3efc72 100755
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@@ -50,7 +50,7 @@ is_proxy_template_valid
 get_domain_values 'web'
 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
 old_tpl=$PROXY
-conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Delete old vhost
@@ -68,7 +68,7 @@ chmod 640 $conf
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$old_tpl.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
 
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$template.stpl"
diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert
index 204b2e3d7..55b73ef8f 100755
--- a/bin/v-change-web-domain-sslcert
+++ b/bin/v-change-web-domain-sslcert
@@ -43,7 +43,7 @@ is_web_domain_cert_valid
 
 # Deleting old certificate
 tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
-rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+rm -f $VESTA/data/users/$user/conf/web/ssl.$domain.*
 mv $USER_DATA/ssl/$domain.* $tmpdir
 chown -R $user:$user $tmpdir
 
@@ -57,11 +57,11 @@ if [ -e "$ssl_dir/$domain.ca" ]; then
 fi
 
 # Adding new certificate to user dir
-cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
-cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
-cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
+cp -f $USER_DATA/ssl/$domain.crt $VESTA/data/users/$user/conf/web/ssl.$domain.crt
+cp -f $USER_DATA/ssl/$domain.key $VESTA/data/users/$user/conf/web/ssl.$domain.key
+cp -f $USER_DATA/ssl/$domain.pem $VESTA/data/users/$user/conf/web/ssl.$domain.pem
 if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
+    cp -f $USER_DATA/ssl/$domain.ca $VESTA/data/users/$user/conf/web/ssl.$domain.ca
 fi
 
 
diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome
index c2b360f2b..59bf1ba49 100755
--- a/bin/v-change-web-domain-sslhome
+++ b/bin/v-change-web-domain-sslhome
@@ -40,7 +40,7 @@ get_domain_values 'web'
 old_ssl_home=$SSL_HOME
 SSL_HOME=$ssl_home
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
 
 # Parsing tpl_option
 case $SSL_HOME in
@@ -57,7 +57,7 @@ replace_web_config
 # Checking proxy config
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     replace_web_config
 fi
 
diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats
index 11f59e986..2a708550f 100755
--- a/bin/v-change-web-domain-stats
+++ b/bin/v-change-web-domain-stats
@@ -57,7 +57,7 @@ stats_dir="$HOMEDIR/$user/web/$domain/stats"
 rm -rf $stats_dir/*
 
 # Deleting config
-rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
+rm -f $VESTA/data/users/$user/conf/web/$STATS.$domain.conf
 
 # Preparing domain values for the template substitution
 upd_web_domain_values
@@ -78,11 +78,11 @@ cat $WEBTPL/$type/$type.tpl |\
         -e "s/%home%/${HOMEDIR////\/}/g" \
         -e "s/%alias%/${aliases//,/ }/g" \
         -e "s/%alias_idn%/${aliases_idn//,/ }/g" \
-    > $HOMEDIR/$user/conf/web/$type.$domain.conf
+    > $VESTA/data/users/$user/conf/web/$type.$domain.conf
 
 if [ "$type" == 'awstats' ]; then
     rm -f /etc/awstats/$type.$domain_idn.conf
-    ln -s $HOMEDIR/$user/conf/web/$type.$domain.conf \
+    ln -s $VESTA/data/users/$user/conf/web/$type.$domain.conf \
         /etc/awstats/$type.$domain_idn.conf
 else
     mkdir -p /var/lib/webalizer
diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl
index ff7ae8353..9f0d51867 100755
--- a/bin/v-change-web-domain-tpl
+++ b/bin/v-change-web-domain-tpl
@@ -49,13 +49,13 @@ ip=$(get_real_ip $IP)
 # Deleting domain
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
 old_tpl=$TPL
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 del_web_config
 
 # Deleting ssl vhost
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
 fi
 
@@ -73,7 +73,7 @@ fi
 
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     tpl_file="$WEBTPL/$WEB_SYSTEM/$template.stpl"
 
     add_web_config
diff --git a/bin/v-check-user-password b/bin/v-check-user-password
new file mode 100755
index 0000000000000000000000000000000000000000..4902e7dcb331ac286e1492eb4371a38b7f6377ed
GIT binary patch
literal 9648
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
Z75~=+J4*kcU`O%459|p4w*xcge*>-PNvQw;

literal 0
HcmV?d00001

diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
index 774f53819..cabc9af87 100755
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@@ -51,7 +51,7 @@ fi
 
 # Deleting domain in named.conf
 sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" $dns_conf
-rm -f $HOMEDIR/$user/conf/dns/$domain.db
+rm -f $VESTA/data/users/$user/conf/dns/$domain.db
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record
index e3de75fa8..f1fc304e2 100755
--- a/bin/v-delete-dns-record
+++ b/bin/v-delete-dns-record
@@ -33,7 +33,6 @@ is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
 is_object_unsuspended 'dns' 'DOMAIN' "$domain"
 is_object_valid "dns/$domain" 'ID' "$id"
-is_dns_record_critical
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account
index b242ab247..e52281f8a 100755
--- a/bin/v-delete-mail-account
+++ b/bin/v-delete-mail-account
@@ -42,11 +42,11 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS')
 for al in ${aliases//,/ }; do
-    sed -i "/^$al@$domain:$account/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/^$al@$domain:$account/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
 done
 
-sed -i "/^$account@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 rm -rf $HOMEDIR/$user/mail/$domain/$account
 
 
diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias
index dd7e10fa0..0df642440 100755
--- a/bin/v-delete-mail-account-alias
+++ b/bin/v-delete-mail-account-alias
@@ -48,7 +48,7 @@ fi
 #                       Action                             #
 #----------------------------------------------------------#
 
-sed -i "/^$malias@$domain:$account/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/^$malias@$domain:$account/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
 aliases=$(echo "$aliases" |\
     sed "s/,/\n/g"|\
     sed "s/^$malias$//g"|\
diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply
index fcbe088df..0242375a0 100755
--- a/bin/v-delete-mail-account-autoreply
+++ b/bin/v-delete-mail-account-autoreply
@@ -43,7 +43,7 @@ is_object_value_exist "mail/$domain" 'ACCOUNT' "$account" '$AUTOREPLY'
 #                       Action                             #
 #----------------------------------------------------------#
 
-rm -f $HOMEDIR/$user/conf/mail/$domain/autoreply.$account.msg
+rm -f $VESTA/data/users/$user/conf/mail/$domain/autoreply.$account.msg
 rm -f $USER_DATA/mail/$domain/$account@$domain.msg
 
 
diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward
index a65aa6ab3..401bf77b0 100755
--- a/bin/v-delete-mail-account-forward
+++ b/bin/v-delete-mail-account-forward
@@ -54,8 +54,8 @@ fwd=$(echo "$fwd" |\
     sed "/^$/d"|\
     sed ':a;N;$!ba;s/\n/,/g')
 
-sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
-echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/^$account@$domain:/ d" $VESTA/data/users/$user/conf/mail/$domain/aliases
+echo "$account@$domain:$fwd" >> $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-account-fwd-only b/bin/v-delete-mail-account-fwd-only
index 0fb95ab9a..ebdd045c9 100755
--- a/bin/v-delete-mail-account-fwd-only
+++ b/bin/v-delete-mail-account-fwd-only
@@ -42,7 +42,7 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 
 # Deleting account from fwd_only
-sed -i "/^$account$/d" $HOMEDIR/$user/conf/mail/$domain/fwd_only
+sed -i "/^$account$/d" $VESTA/data/users/$user/conf/mail/$domain/fwd_only
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain
index 3729d81f6..54e8b9245 100755
--- a/bin/v-delete-mail-domain
+++ b/bin/v-delete-mail-domain
@@ -43,7 +43,7 @@ get_domain_values 'mail'
 accounts=$(wc -l $USER_DATA/mail/$domain.conf|cut -f 1 -d ' ')
 
 rm -f /etc/$MAIL_SYSTEM/domains/$domain_idn
-rm -rf $HOMEDIR/$user/conf/mail/$domain
+rm -rf $VESTA/data/users/$user/conf/mail/$domain
 rm -rf $HOMEDIR/$user/mail/$domain_idn
 
 
diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam
index 41c902be4..31791d001 100755
--- a/bin/v-delete-mail-domain-antispam
+++ b/bin/v-delete-mail-domain-antispam
@@ -40,7 +40,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$ANTISPAM'
 #----------------------------------------------------------#
 
 # Delete antispam flag
-rm -f $HOMEDIR/$user/conf/mail/$domain/antispam
+rm -f $VESTA/data/users/$user/conf/mail/$domain/antispam
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus
index cfec16ce6..bbb9cf6fa 100755
--- a/bin/v-delete-mail-domain-antivirus
+++ b/bin/v-delete-mail-domain-antivirus
@@ -40,7 +40,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS'
 #----------------------------------------------------------#
 
 # Delete antivirus flag
-rm -f $HOMEDIR/$user/conf/mail/$domain/antivirus
+rm -f $VESTA/data/users/$user/conf/mail/$domain/antivirus
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall
index 52b3e9429..1fc22d6e6 100755
--- a/bin/v-delete-mail-domain-catchall
+++ b/bin/v-delete-mail-domain-catchall
@@ -40,7 +40,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$CATCHALL'
 #----------------------------------------------------------#
 
 # Delete cathcall alias
-sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+sed -i "/*@$domain:/d" $VESTA/data/users/$user/conf/mail/$domain/aliases
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim
index c0846ded0..74b75093c 100755
--- a/bin/v-delete-mail-domain-dkim
+++ b/bin/v-delete-mail-domain-dkim
@@ -41,7 +41,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$DKIM'
 # Generating dkim
 rm -f $USER_DATA/mail/$domain.pem
 rm -f $USER_DATA/mail/$domain.pub
-rm -f $HOMEDIR/$user/conf/mail/$domain/dkim.pem
+rm -f $VESTA/data/users/$user/conf/mail/$domain/dkim.pem
 
 # Checking dns domain
 check_dns_domain=$(is_object_valid 'dns' 'DOMAIN' "$domain")
diff --git a/bin/v-delete-user b/bin/v-delete-user
index d05cc7d9d..ded83d365 100755
--- a/bin/v-delete-user
+++ b/bin/v-delete-user
@@ -91,7 +91,7 @@ sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe
 
 # Removing system user
 /usr/sbin/userdel -f $user
-chattr -i $HOMEDIR/$user/conf
+#chattr -i $HOMEDIR/$user/conf
 rm -rf $HOMEDIR/$user
 rm -f /var/spool/mail/$user
 rm -f /var/spool/cron/$user
diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain
index edba9747e..06d3df6e5 100755
--- a/bin/v-delete-web-domain
+++ b/bin/v-delete-web-domain
@@ -45,7 +45,7 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
 # Get template name
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 ip=$(get_real_ip $IP)
 
 # Deleting domain
@@ -61,23 +61,23 @@ fi
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
 
     # Deleting SSL certificates
-    rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+    rm -f $VESTA/data/users/$user/conf/web/ssl.$domain.*
     rm -f $USER_DATA/ssl/$domain.*
 fi
 
 # Checking proxy
 if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
 
     if [ "$SSL" = 'yes' ]; then
         tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         del_web_config
     fi
 fi
@@ -85,7 +85,7 @@ fi
 # Checking stats
 if [ ! -z "$STATS" ] && [ "$STATS" != 'no' ]; then
     sed -i "/ $domain$/d" $VESTA/data/queue/webstats.pipe
-    rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
+    rm -f $VESTA/data/users/$user/conf/web/$STATS.$domain.conf
     rm -f /etc/awstats/$STATS.$domain.conf
 fi
 
@@ -115,14 +115,14 @@ conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
 ssl_dom=$(grep "SSL='yes'" $USER_DATA/web.conf | wc -l)
 if [ "$ssl_dom" -eq '0' ]; then
     sed -i "/.*\/$user\/.*s$WEB_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf
 fi
 
 # Checking last domain
 domains=$(wc -l $USER_DATA/web.conf | cut -f1 -d ' ')
 if [ "$domains" -eq '0' ]; then
     sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf
 fi
 
 # Proxy
@@ -132,14 +132,14 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     last_sproxy=$(grep "SSL='yes'" $USER_DATA/web.conf)
     if [ -z "$last_sproxy" ]; then
         sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
-        rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
     fi
 
     # Checking last proxy
     last_proxy=$(grep -v "PROXY=''" $USER_DATA/web.conf)
     if [ -z "$last_proxy" ]; then
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $conf
-        rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf
     fi
 fi
 
diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias
index c7b66a474..aec74ec61 100755
--- a/bin/v-delete-web-domain-alias
+++ b/bin/v-delete-web-domain-alias
@@ -56,7 +56,7 @@ ALIAS=$(echo "$ALIAS" |\
     sed -e "/^$/d"|\
     sed -e ':a;N;$!ba;s/\n/,/g')
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 
 # Preparing domain values for the template substitution
 upd_web_domain_values
@@ -67,7 +67,7 @@ add_web_config
 
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -75,13 +75,13 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 
     if [ "$SSL" = 'yes' ]; then
         tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         del_web_config
         add_web_config
     fi
diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy
index 20c4ff4a0..c3af0ba5d 100755
--- a/bin/v-delete-web-domain-proxy
+++ b/bin/v-delete-web-domain-proxy
@@ -42,13 +42,13 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$PROXY'
 # Defining domain parameters
 get_domain_values 'web'
 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
 del_web_config
 
 # Checking SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
 fi
 
@@ -67,14 +67,14 @@ conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
 last_sproxy=$(grep "SSL='yes'" $USER_DATA/web.conf)
 if [ -z "$last_sproxy" ]; then
     sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
 fi
 
 # Checking last proxy
 last_proxy=$(grep -v "PROXY=''" $USER_DATA/web.conf)
 if [ -z "$last_proxy" ]; then
     sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf
 fi
 
 # Restart proxy server
diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl
index 61d0072d3..2713f61d8 100755
--- a/bin/v-delete-web-domain-ssl
+++ b/bin/v-delete-web-domain-ssl
@@ -41,7 +41,7 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
 
 # Parsing domain values
 get_domain_values 'web'
-conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
 
 # Deleting domain
@@ -49,14 +49,14 @@ del_web_config
 
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
     del_web_config
 fi
 
 # Deleting old certificate
 tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
-rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+rm -f $VESTA/data/users/$user/conf/web/ssl.$domain.*
 mv $USER_DATA/ssl/$domain.* $tmpdir
 chown -R $user:$user $tmpdir
 
@@ -73,7 +73,7 @@ ssl_dom=$(grep "SSL='yes'" $USER_DATA/web.conf)
 conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
 if [ -z "$ssl_dom" ]; then
     sed -i "/.*\/$user\/.*s$WEB_SYSTEM.conf/d" $conf
-    rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
+    rm -f $VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf
 
 fi
 
@@ -82,7 +82,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
     if [ -z "$ssl_dom" ]; then
         sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
-        rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
     fi
 fi
 
diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats
index 3d2292a9f..054c524d2 100755
--- a/bin/v-delete-web-domain-stats
+++ b/bin/v-delete-web-domain-stats
@@ -50,7 +50,7 @@ rm -rf $stats_dir/*
 
 # Deleting config
 rm -f /etc/awstats/$STATS.$domain_idn.conf
-rm -f $HOMEDIR/$user/conf/web/$STATS.$domain.conf
+rm -f $VESTA/data/users/$user/conf/web/$STATS.$domain.conf
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services
index aa3b259d2..9b52185a2 100755
--- a/bin/v-list-sys-services
+++ b/bin/v-list-sys-services
@@ -147,22 +147,10 @@ service=$DB_SYSTEM
 if [ ! -z "$service" ] && [ "$service" != 'no' ]; then
     for db in ${DB_SYSTEM//,/ }; do
         service="$db"
-        if [ "$service" == 'mysql' ]; then
-            if [ ! -e "/etc/init.d/$service" ]; then
-                service='mysqld'
-            fi
-            if [ ! -e "/etc/redhat-release" ]; then
-                db_proc_name='mysqld'
-            fi
+        if [ "$service" == 'mysql' ] && [ ! -e "/etc/init.d/$service" ]; then
+            service='mysqld'
         fi
-        if [ "$service" == 'pgsql' ]; then
-            service='postgresql'
-            db_proc_name='postmaster'
-            if [ ! -e "/etc/redhat-release" ]; then
-                db_proc_name='postgres'
-            fi
-        fi
-        get_srv_state $service $db_proc_name
+        get_srv_state $service
         str="$str\nNAME='$service' SYSTEM='database server' STATE='$state'"
         str="$str CPU='$cpu' MEM='$mem' RTIME='$rtime'"
     done
diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index 90294eb98..e664ac252 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -46,7 +46,7 @@ nohead=1
 domain_counter=0
 
 # Clean up old config
-rm -f $HOMEDIR/$user/conf/tmp_*.conf
+rm -f $VESTA/data/users/$user/conf/tmp_*.conf
 
 # Starting loop
 for domain in $(shell_list); do
@@ -67,7 +67,7 @@ fi
 # Checking if there is at least 1 domain
 if [ "$domain_counter" -lt 1 ]; then
     # Deleting web configs
-    rm -f $HOMEDIR/$user/conf/web/*
+    rm -f $VESTA/data/users/$user/conf/web/*
     sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $web_conf
     if [ -e "$proxy_conf" ]; then
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
@@ -81,8 +81,8 @@ else
     fi
 
     # Renaming tmp config
-    tmp_conf="$HOMEDIR/$user/conf/web/tmp_$WEB_SYSTEM.conf"
-    conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+    tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
     mv $tmp_conf $conf
 
     # Checking include
@@ -93,8 +93,8 @@ else
 
     # Checking SSL
     if [ "$ssl_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
-        conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+        tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
         mv $tmp_conf $conf
     fi
     ssl_include=$(grep "$conf" $web_conf )
@@ -104,32 +104,32 @@ else
 
     # Checking proxy
     if [ "$proxy_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
-        conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+        tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
         mv $tmp_conf $conf
         proxy_include=$(grep "$conf" $proxy_conf )
         if [ -z "$proxy_include" ]; then
             echo "include $conf;" >> $proxy_conf
         fi
     else
-        conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
-        rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf
     fi
 
     # Checking SSL proxy
     if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then
-        tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         mv $tmp_conf $conf
         proxy_include=$(grep "$conf" $proxy_conf )
         if [ -z "$proxy_include" ]; then
             echo "include $conf;" >> $proxy_conf
         fi
     else
-        conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+        conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
         sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
-        rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+        rm -f $VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf
 
     fi
 fi
diff --git a/bin/v-restore-user b/bin/v-restore-user
index a7a6f74c4..7e914a6d2 100755
--- a/bin/v-restore-user
+++ b/bin/v-restore-user
@@ -50,8 +50,8 @@ is_backup_valid() {
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-args_usage='USER BACKUP [WEB] [DNS] [MAIL] [DB] [CRON] [UDIR] [NOTIFY]'
-check_args '2' "$#" "$args_usage"
+args='USER BACKUP [WEB] [DNS] [MAIL] [DB] [CRON] [UDIR] [NOTIFY]'
+check_args '2' "$#" "$args"
 validate_format 'user' 'backup'
 is_backup_valid
 is_backup_available
@@ -302,8 +302,8 @@ if [ "$web" != 'no' ]; then
 
             # Adding vhost
             web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
-            tmp_conf="$HOMEDIR/$user/conf/web/tmp_$WEB_SYSTEM.conf"
-            conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+            tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$WEB_SYSTEM.conf"
+            conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
             cat $tmp_conf >> $conf
             rm -f $tmp_conf
             web_include=$(grep "$conf" $web_conf)
@@ -313,8 +313,8 @@ if [ "$web" != 'no' ]; then
 
             # Adding SSL vhost
             if [ "$SSL" = 'yes' ]; then
-                tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
-                conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+                tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$WEB_SYSTEM.conf"
+                conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
                 cat $tmp_conf >> $conf
                 rm -f $tmp_conf
             fi
@@ -328,8 +328,8 @@ if [ "$web" != 'no' ]; then
                 # Adding proxy vhost
                 proxy_conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
                 if [ ! -z "$PROXY" ]; then
-                    tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
-                    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+                    tmp_conf="$VESTA/data/users/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
+                    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
                     cat $tmp_conf >> $conf
                     rm -f $tmp_conf
                 fi
@@ -340,8 +340,8 @@ if [ "$web" != 'no' ]; then
 
                 # Adding SSL proxy vhost
                 if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
-                    tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
-                    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+                    tmp_conf="$VESTA/data/users/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
+                    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
                     cat $tmp_conf >> $conf
                     rm -f $tmp_conf
                     proxy_include=$(grep "$conf" $proxy_conf)
diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account
index e5b75c74f..9fefeb097 100755
--- a/bin/v-suspend-mail-account
+++ b/bin/v-suspend-mail-account
@@ -42,9 +42,9 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 #----------------------------------------------------------#
 
 quota=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA')
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:SUSPENDED:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain
index 005b81527..a94e929ec 100755
--- a/bin/v-suspend-web-domain
+++ b/bin/v-suspend-web-domain
@@ -43,7 +43,7 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
 # Parsing domain values
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 SUSPENDED='yes'
 ip=$(get_real_ip $IP)
 
@@ -57,7 +57,7 @@ add_web_config
 # Check SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -65,7 +65,7 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 
@@ -74,7 +74,7 @@ fi
 # Checking proxy SSL
 if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SSL/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account
index 776d1f92e..d4f23af09 100755
--- a/bin/v-unsuspend-mail-account
+++ b/bin/v-unsuspend-mail-account
@@ -43,9 +43,9 @@ is_object_suspended "mail/$domain" 'ACCOUNT' "$account"
 
 md5=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5')
 quota=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA')
-sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
+sed -i "/^$account:/d" $VESTA/data/users/$user/conf/mail/$domain/passwd
 str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
-echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
+echo $str >> $VESTA/data/users/$user/conf/mail/$domain/passwd
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain
index d9c004492..fbae76ee7 100755
--- a/bin/v-unsuspend-mail-domain
+++ b/bin/v-unsuspend-mail-domain
@@ -38,7 +38,7 @@ is_object_suspended 'mail' 'DOMAIN' "$domain"
 #----------------------------------------------------------#
 
 # Add symbolic link
-ln -s $HOMEDIR/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/
+ln -s $VESTA/data/users/$user/conf/mail/$domain /etc/$MAIL_SYSTEM/domains/
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain
index eaae49e56..b79cc4e98 100755
--- a/bin/v-unsuspend-web-domain
+++ b/bin/v-unsuspend-web-domain
@@ -41,7 +41,7 @@ is_object_suspended 'web' 'DOMAIN' "$domain"
 # Parsing domain values
 get_domain_values 'web'
 tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.tpl"
-conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+conf="$VESTA/data/users/$user/conf/web/$WEB_SYSTEM.conf"
 SUSPENDED='no'
 ip=$(get_real_ip $IP)
 
@@ -55,7 +55,7 @@ add_web_config
 # Check SSL
 if [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$WEB_SYSTEM/$TPL.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$WEB_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -63,7 +63,7 @@ fi
 # Checking proxy
 if [ ! -z "$PROXY" ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-    conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
@@ -71,7 +71,7 @@ fi
 # Checking SSL proxy
 if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
     tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-    conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+    conf="$VESTA/data/users/$user/conf/web/s$PROXY_SYSTEM.conf"
     del_web_config
     add_web_config
 fi
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index bde0b008d..c8dea4efd 100755
--- a/bin/v-update-sys-ip
+++ b/bin/v-update-sys-ip
@@ -16,7 +16,6 @@ user=${1-admin}
 ip_status=${2-shared}
 
 # Includes
-source /etc/profile.d/vesta.sh
 source $VESTA/func/main.sh
 source $VESTA/conf/vesta.conf
 
@@ -36,7 +35,7 @@ is_object_valid 'user' 'USER' "$user" "$user"
 
 # Get list of ip addresses
 ip_list=$(/sbin/ifconfig | grep 'inet addr:' | cut -f 2 -d : | \
-    cut -f 1 -d ' '| grep -v 127.0.0.1 | grep -v '0.0.0.')
+    cut -f 1 -d ' '| grep -v 127.0.0.1)
 ip_num=$(echo "$ip_list" | wc -l)
 
 # WorkAround for Amazon stop/start issue
diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat
index ba80a5c1d..b23f71602 100755
--- a/bin/v-update-web-domain-stat
+++ b/bin/v-update-web-domain-stat
@@ -41,7 +41,7 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$STATS'
 get_domain_values 'web'
 
 # Checking config
-config="$HOMEDIR/$user/conf/web/$STATS.$domain.conf"
+config="$VESTA/data/users/$user/conf/web/$STATS.$domain.conf"
 if [ ! -e "$config" ]; then
     echo "Error: Parsing error"
     log_event "$E_PARSING" "$EVENT"
diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates
index 8d426240b..ee5c5cb31 100755
--- a/bin/v-update-web-templates
+++ b/bin/v-update-web-templates
@@ -43,14 +43,6 @@ fi
 # Update templates
 tar -xzpf templates.tar.gz -C $VESTA/data/ templates/web
 
-# Replace includes for apache2.4
-if [ "$os" = 'ubuntu' ]; then
-    if [ ! -z "$(apache2 -v|grep 'Apache/2.4')" ]; then
-        sed -i "s/Include /IncludeOptional /g" \
-            $VESTA/data/templates/web/apache2/*tpl
-    fi
-fi
-
 # Rebuild web domains
 for user in $($BIN/v-list-sys-users plain); do
     $BIN/v-rebuild-web-domains $user no

From a856fed4ac345ebbde5ae88bbcbc44ecc65e1b79 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:28:59 +0800
Subject: [PATCH 05/25] Update domain.sh

---
 func/domain.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/func/domain.sh b/func/domain.sh
index 4215ae678..4ecc5cc41 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -445,10 +445,10 @@ upd_web_domain_values() {
         cgi_option='+ExecCGI'
     fi
 
-    ssl_crt="$HOMEDIR/$user/conf/web/ssl.$domain.crt"
-    ssl_key="$HOMEDIR/$user/conf/web/ssl.$domain.key"
-    ssl_pem="$HOMEDIR/$user/conf/web/ssl.$domain.pem"
-    ssl_ca="$HOMEDIR/$user/conf/web/ssl.$domain.ca"
+    ssl_crt="$USER_DATA/ssl/$domain.crt"
+    ssl_key="$USER_DATA/ssl/$domain.key"
+    ssl_pem="$USER_DATA/ssl/$domain.pem"
+    ssl_ca="$USER_DATA/ssl/$domain.ca"
     if [ ! -e "$USER_DATA/ssl/$domain.ca" ]; then
         ssl_ca_str='#'
     fi

From 41022f1c265ea69d43e7683c2a12e06b0fea641e Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:48:44 +0800
Subject: [PATCH 06/25] remove   include

remove  include %home%/%user%/conf/nginx.%domain%.conf*;
---
 install/rhel/templates/web/nginx/caching.tpl | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/install/rhel/templates/web/nginx/caching.tpl b/install/rhel/templates/web/nginx/caching.tpl
index 8860be198..f33bab9d9 100755
--- a/install/rhel/templates/web/nginx/caching.tpl
+++ b/install/rhel/templates/web/nginx/caching.tpl
@@ -30,12 +30,6 @@ server {
     location @fallback {
         proxy_pass      http://%ip%:%web_port%;
     }
-
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }

From 4f0483028dcef7a0fb7ede0c2af0ad34e87f5b6f Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:49:18 +0800
Subject: [PATCH 07/25] Update caching.stpl

---
 install/rhel/templates/web/nginx/caching.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/rhel/templates/web/nginx/caching.stpl b/install/rhel/templates/web/nginx/caching.stpl
index 31f6111fa..9465ea1ea 100755
--- a/install/rhel/templates/web/nginx/caching.stpl
+++ b/install/rhel/templates/web/nginx/caching.stpl
@@ -34,11 +34,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }

From 1aaf51a622a1397125986809d972f542dd770824 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:49:45 +0800
Subject: [PATCH 08/25] Update default.stpl

---
 install/rhel/templates/web/nginx/default.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/rhel/templates/web/nginx/default.stpl b/install/rhel/templates/web/nginx/default.stpl
index 53ad8d1b8..6f1b8659f 100755
--- a/install/rhel/templates/web/nginx/default.stpl
+++ b/install/rhel/templates/web/nginx/default.stpl
@@ -25,12 +25,6 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 

From dbbc7660637e72981e98cfd1881d7c5d89db2d44 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:50:08 +0800
Subject: [PATCH 09/25] Update default.tpl

---
 install/rhel/templates/web/nginx/default.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/rhel/templates/web/nginx/default.tpl b/install/rhel/templates/web/nginx/default.tpl
index c1fec114f..23b66557d 100755
--- a/install/rhel/templates/web/nginx/default.tpl
+++ b/install/rhel/templates/web/nginx/default.tpl
@@ -22,12 +22,6 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 

From 1e2409f991d280be0bc60a95dfb092891222245b Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:50:46 +0800
Subject: [PATCH 10/25] Update hosting.stpl

---
 install/rhel/templates/web/nginx/hosting.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/rhel/templates/web/nginx/hosting.stpl b/install/rhel/templates/web/nginx/hosting.stpl
index aca458a4b..9043ef138 100755
--- a/install/rhel/templates/web/nginx/hosting.stpl
+++ b/install/rhel/templates/web/nginx/hosting.stpl
@@ -25,14 +25,8 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 

From 08cba074fa16b460f1a28c945d730cf4c9539c2e Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:51:12 +0800
Subject: [PATCH 11/25] Update hosting.tpl

---
 install/rhel/templates/web/nginx/hosting.tpl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/install/rhel/templates/web/nginx/hosting.tpl b/install/rhel/templates/web/nginx/hosting.tpl
index 44d874962..90f480138 100755
--- a/install/rhel/templates/web/nginx/hosting.tpl
+++ b/install/rhel/templates/web/nginx/hosting.tpl
@@ -22,14 +22,9 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 

From 0fd7ee2d7b8d7b2fc718cb72d404b72634d2514e Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:53:53 +0800
Subject: [PATCH 12/25] Update caching.stpl

---
 install/debian/templates/web/nginx/caching.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/debian/templates/web/nginx/caching.stpl b/install/debian/templates/web/nginx/caching.stpl
index 036dc6ee7..4d66a9d9a 100755
--- a/install/debian/templates/web/nginx/caching.stpl
+++ b/install/debian/templates/web/nginx/caching.stpl
@@ -34,11 +34,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }

From cb5cc89de250daa64cf4e860de2c8c94ffaa007c Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:54:09 +0800
Subject: [PATCH 13/25] Update caching.tpl

---
 install/debian/templates/web/nginx/caching.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/debian/templates/web/nginx/caching.tpl b/install/debian/templates/web/nginx/caching.tpl
index 04e38d445..83e2ca465 100755
--- a/install/debian/templates/web/nginx/caching.tpl
+++ b/install/debian/templates/web/nginx/caching.tpl
@@ -31,11 +31,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }

From 5d3edfd40e35cf257ba3dc0a159b1fe73e9f641f Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:54:26 +0800
Subject: [PATCH 14/25] Update default.stpl

---
 install/debian/templates/web/nginx/default.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/debian/templates/web/nginx/default.stpl b/install/debian/templates/web/nginx/default.stpl
index fa5380606..da8be6751 100755
--- a/install/debian/templates/web/nginx/default.stpl
+++ b/install/debian/templates/web/nginx/default.stpl
@@ -25,12 +25,6 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 

From 643027fc00948406cefac2a2a930b7fc051e8060 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:54:42 +0800
Subject: [PATCH 15/25] Update default.tpl

---
 install/debian/templates/web/nginx/default.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/debian/templates/web/nginx/default.tpl b/install/debian/templates/web/nginx/default.tpl
index 4d5c774bc..f15b96e00 100755
--- a/install/debian/templates/web/nginx/default.tpl
+++ b/install/debian/templates/web/nginx/default.tpl
@@ -22,12 +22,6 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 

From 1e088ca883710004c3603d8e4d0218ac152fc04a Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:55:09 +0800
Subject: [PATCH 16/25] Update hosting.stpl

---
 install/debian/templates/web/nginx/hosting.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/debian/templates/web/nginx/hosting.stpl b/install/debian/templates/web/nginx/hosting.stpl
index d778d6333..c3c88ab52 100755
--- a/install/debian/templates/web/nginx/hosting.stpl
+++ b/install/debian/templates/web/nginx/hosting.stpl
@@ -25,14 +25,8 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 

From 8c20f4d209f3a4be482265c87783f6c3e10e60af Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:55:45 +0800
Subject: [PATCH 17/25] Update hosting.tpl

---
 install/debian/templates/web/nginx/hosting.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/debian/templates/web/nginx/hosting.tpl b/install/debian/templates/web/nginx/hosting.tpl
index 15961c95c..04fddad87 100755
--- a/install/debian/templates/web/nginx/hosting.tpl
+++ b/install/debian/templates/web/nginx/hosting.tpl
@@ -22,14 +22,8 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 

From 18b4f696175c6d41b0b6e0d80b8e11c0110a33d6 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:56:50 +0800
Subject: [PATCH 18/25] Update caching.stpl

---
 install/ubuntu/templates/web/nginx/caching.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/ubuntu/templates/web/nginx/caching.stpl b/install/ubuntu/templates/web/nginx/caching.stpl
index 036dc6ee7..4d66a9d9a 100755
--- a/install/ubuntu/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/templates/web/nginx/caching.stpl
@@ -34,11 +34,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }

From 0c36a4b90d274c971381a12615bd9a0ff826214a Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:57:22 +0800
Subject: [PATCH 19/25] Update caching.tpl

---
 install/ubuntu/templates/web/nginx/caching.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/ubuntu/templates/web/nginx/caching.tpl b/install/ubuntu/templates/web/nginx/caching.tpl
index 04e38d445..83e2ca465 100755
--- a/install/ubuntu/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/templates/web/nginx/caching.tpl
@@ -31,11 +31,5 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }

From bde59ee83a90c0c8fa3c4319da02f0bf25706144 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:57:47 +0800
Subject: [PATCH 20/25] Update default.stpl

---
 install/ubuntu/templates/web/nginx/default.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/ubuntu/templates/web/nginx/default.stpl b/install/ubuntu/templates/web/nginx/default.stpl
index fa5380606..1b91b04e0 100755
--- a/install/ubuntu/templates/web/nginx/default.stpl
+++ b/install/ubuntu/templates/web/nginx/default.stpl
@@ -25,12 +25,6 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+       location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 

From 1d71d4e2b2c15ba877743f29fa23f9737916eb97 Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:58:30 +0800
Subject: [PATCH 21/25] Update default.tpl

---
 install/ubuntu/templates/web/nginx/default.tpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/ubuntu/templates/web/nginx/default.tpl b/install/ubuntu/templates/web/nginx/default.tpl
index 4d5c774bc..f15b96e00 100755
--- a/install/ubuntu/templates/web/nginx/default.tpl
+++ b/install/ubuntu/templates/web/nginx/default.tpl
@@ -22,12 +22,6 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
-
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 }
 

From 129fc8ad0680ecb39c3a096f781431ecaca32b8f Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:59:01 +0800
Subject: [PATCH 22/25] Update hosting.stpl

---
 install/ubuntu/templates/web/nginx/hosting.stpl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/ubuntu/templates/web/nginx/hosting.stpl b/install/ubuntu/templates/web/nginx/hosting.stpl
index d778d6333..304e71008 100755
--- a/install/ubuntu/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/templates/web/nginx/hosting.stpl
@@ -25,14 +25,8 @@ server {
         proxy_pass      https://%ip%:%web_ssl_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
-
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 

From c58aff5ebd6af3124468aa1a03644cf84bd9fcab Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Thu, 6 Feb 2014 23:59:36 +0800
Subject: [PATCH 23/25] Update hosting.tpl

---
 install/ubuntu/templates/web/nginx/hosting.tpl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/install/ubuntu/templates/web/nginx/hosting.tpl b/install/ubuntu/templates/web/nginx/hosting.tpl
index 15961c95c..8f03503ea 100755
--- a/install/ubuntu/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/templates/web/nginx/hosting.tpl
@@ -22,14 +22,9 @@ server {
         proxy_pass      http://%ip%:%web_port%;
     }
 
-    location ~ /\.ht    {return 404;}
-    location ~ /\.svn/  {return 404;}
-    location ~ /\.git/  {return 404;}
-    location ~ /\.hg/   {return 404;}
-    location ~ /\.bzr/  {return 404;}
+    location ~ .*\.(mp3|ftpquota|htaccess|svn|ht|git|hg|bzr)?\$ {deny all;}
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 

From 724d00441b931243a3a8c0b36549599a8630a9ba Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Fri, 7 Feb 2014 02:46:57 +0800
Subject: [PATCH 24/25] Update suphp.stpl

---
 install/rhel/templates/web/httpd/suphp.stpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install/rhel/templates/web/httpd/suphp.stpl b/install/rhel/templates/web/httpd/suphp.stpl
index c210d6751..11dabe47d 100644
--- a/install/rhel/templates/web/httpd/suphp.stpl
+++ b/install/rhel/templates/web/httpd/suphp.stpl
@@ -37,6 +37,5 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include /usr/local/vesta/data/users/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>

From 85d4515fac7749a388053679cc349d26781c780b Mon Sep 17 00:00:00 2001
From: zbuse <September@val.so>
Date: Fri, 7 Feb 2014 02:47:11 +0800
Subject: [PATCH 25/25] Update suphp.tpl

---
 install/rhel/templates/web/httpd/suphp.tpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install/rhel/templates/web/httpd/suphp.tpl b/install/rhel/templates/web/httpd/suphp.tpl
index ff0b52398..ecbedb021 100644
--- a/install/rhel/templates/web/httpd/suphp.tpl
+++ b/install/rhel/templates/web/httpd/suphp.tpl
@@ -31,6 +31,5 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include /usr/local/vesta/data/users/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>