From 4a27e61d60ea6e781a1b0985c2ccf7bf58c1031f Mon Sep 17 00:00:00 2001
From: Luiz Junior <luizjrdeveloper@gmail.com>
Date: Tue, 31 Jul 2018 10:32:47 -0300
Subject: [PATCH 01/28] Fix Dovecot Connection

Fix dovecot Connection
---
 install/ubuntu/16.04/dovecot/dovecot.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ubuntu/16.04/dovecot/dovecot.conf b/install/ubuntu/16.04/dovecot/dovecot.conf
index 311a3351..55c3672f 100644
--- a/install/ubuntu/16.04/dovecot/dovecot.conf
+++ b/install/ubuntu/16.04/dovecot/dovecot.conf
@@ -3,7 +3,7 @@ listen = *, ::
 base_dir = /var/run/dovecot/
 !include conf.d/*.conf
 
-namespace {
+namespace inbox{
     type = private
     separator = /
     prefix =

From 47a22f4a254aac61bb3c91c4ac7dd0eaf493f1b6 Mon Sep 17 00:00:00 2001
From: Luiz Junior <luizjrdeveloper@gmail.com>
Date: Tue, 31 Jul 2018 10:46:54 -0300
Subject: [PATCH 02/28] Fix dovecot

namespace inbox {
---
 install/ubuntu/16.04/dovecot/dovecot.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ubuntu/16.04/dovecot/dovecot.conf b/install/ubuntu/16.04/dovecot/dovecot.conf
index 55c3672f..163460ba 100644
--- a/install/ubuntu/16.04/dovecot/dovecot.conf
+++ b/install/ubuntu/16.04/dovecot/dovecot.conf
@@ -3,7 +3,7 @@ listen = *, ::
 base_dir = /var/run/dovecot/
 !include conf.d/*.conf
 
-namespace inbox{
+namespace inbox {
     type = private
     separator = /
     prefix =

From 06f670046b21bf8528201c07389d9ab4fbb7cefe Mon Sep 17 00:00:00 2001
From: Skull Writter <7103685+skullwritter@users.noreply.github.com>
Date: Thu, 25 Oct 2018 19:44:46 +0000
Subject: [PATCH 03/28] Fix: #1731

Now checks if the domain is suspended (WEB or EMAIL or DNS) if so, continue to the next domain
---
 bin/v-update-letsencrypt-ssl | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/bin/v-update-letsencrypt-ssl b/bin/v-update-letsencrypt-ssl
index 907d305f..2771f9f8 100755
--- a/bin/v-update-letsencrypt-ssl
+++ b/bin/v-update-letsencrypt-ssl
@@ -31,7 +31,22 @@ for user in $users; do
     # Checking user certificates
     lecounter=0
     for domain in $(search_objects 'web' 'LETSENCRYPT' 'yes' 'DOMAIN'); do
-
+        # Working on Web domain check - if is suspended
+        webSuspended=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf |grep "SUSPENDED='no")
+        if [ ! -z "$webSuspended" ]; then
+                continue;
+        fi;
+        # Working on DNS domain check - if is suspended
+        dnsSuspended=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf |grep "SUSPENDED='no")
+        if [  ! -z "$dnsSuspended" ]; then
+            continue;
+        fi;
+        #dunno if this is needed, but i will ut it in the same way as web and dns
+        # Working on MAIL domain check - if is suspended
+        mailSuspended=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf |grep "SUSPENDED='no")
+        if [  ! -z "$mailSuspended" ]; then
+            continue;
+        fi
         crt="$VESTA/data/users/$user/ssl/$domain.crt"
         crt_data=$(openssl x509 -text -in "$crt")
         expire=$(echo "$crt_data" |grep "Not After")

From fa331e6ef2c98914b3a51147b75f5425adde65c2 Mon Sep 17 00:00:00 2001
From: Skull Writter <7103685+skullwritter@users.noreply.github.com>
Date: Tue, 30 Oct 2018 16:25:24 -0100
Subject: [PATCH 04/28] removed dns and mail support - checking le

---
 bin/v-update-letsencrypt-ssl | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/bin/v-update-letsencrypt-ssl b/bin/v-update-letsencrypt-ssl
index 2771f9f8..6e26d7e5 100755
--- a/bin/v-update-letsencrypt-ssl
+++ b/bin/v-update-letsencrypt-ssl
@@ -36,17 +36,6 @@ for user in $users; do
         if [ ! -z "$webSuspended" ]; then
                 continue;
         fi;
-        # Working on DNS domain check - if is suspended
-        dnsSuspended=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf |grep "SUSPENDED='no")
-        if [  ! -z "$dnsSuspended" ]; then
-            continue;
-        fi;
-        #dunno if this is needed, but i will ut it in the same way as web and dns
-        # Working on MAIL domain check - if is suspended
-        mailSuspended=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf |grep "SUSPENDED='no")
-        if [  ! -z "$mailSuspended" ]; then
-            continue;
-        fi
         crt="$VESTA/data/users/$user/ssl/$domain.crt"
         crt_data=$(openssl x509 -text -in "$crt")
         expire=$(echo "$crt_data" |grep "Not After")

From c32fa673e15272779de2934d410fff72cb6702c3 Mon Sep 17 00:00:00 2001
From: Alexandr Loskutov <alex_connor@icloud.com>
Date: Sun, 4 Nov 2018 08:21:36 +0200
Subject: [PATCH 05/28] Fix Dovecot namespace inbox=yes for CentOS 7

Co-Authored-By: dpeca <dpeca@users.noreply.github.com>
---
 install/vst-install-rhel.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh
index 3aaad808..385534ec 100755
--- a/install/vst-install-rhel.sh
+++ b/install/vst-install-rhel.sh
@@ -1127,6 +1127,9 @@ if [ "$dovecot" = 'yes' ]; then
     cp -rf $vestacp/dovecot /etc/
     cp -f $vestacp/logrotate/dovecot /etc/logrotate.d/
     chown -R root:root /etc/dovecot*
+    if [ "$release" -eq 7 ]; then
+        sed -i "s#namespace inbox {#namespace inbox {\n  inbox = yes#" /etc/dovecot/conf.d/15-mailboxes.conf
+    fi
     chkconfig dovecot on
     service dovecot start
     check_result $? "dovecot start failed"

From 381bc48e9652bdcfe74ef0c864076fd48df5bc07 Mon Sep 17 00:00:00 2001
From: "Made I.T" <info@madeit.be>
Date: Thu, 8 Nov 2018 16:32:31 +0100
Subject: [PATCH 06/28] Fix dubble www

---
 bin/v-add-web-domain | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain
index b937330c..1005bc9c 100755
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@@ -113,9 +113,12 @@ if [ "$aliases" = 'none' ]; then
     ALIAS=''
 else
     ALIAS="www.$domain"
-    if [ ! -z "$aliases" ]; then
-        ALIAS="$ALIAS,$aliases"
+    if [ -z "$aliases" ]; then
+        ALIAS="www.$domain"
+    else
+        ALIAS="$aliases"
     fi
+    
     ip_alias=$(get_ip_alias $domain)
     if [ ! -z "$ip_alias" ]; then
         ALIAS="$ALIAS,$ip_alias"

From 2dc406aae4801b4151daa4f8e052a3ad367e3a8d Mon Sep 17 00:00:00 2001
From: "Made I.T" <info@madeit.be>
Date: Thu, 8 Nov 2018 16:33:34 +0100
Subject: [PATCH 07/28] Fix dubble www

---
 func/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/func/main.sh b/func/main.sh
index e78e6edf..ca4ac3c5 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -933,7 +933,7 @@ format_aliases() {
         aliases=$(echo "$aliases" |tr -s '.')
         aliases=$(echo "$aliases" |sed -e "s/[.]*$//g")
         aliases=$(echo "$aliases" |sed -e "s/^[.]*//")
-        aliases=$(echo "$aliases" |grep -v www.$domain |sed -e "/^$/d")
+        aliases=$(echo "$aliases" |sed -e "/^$/d")
         aliases=$(echo "$aliases" |tr '\n' ',' |sed -e "s/,$//")
     fi
 }

From b9210522f57ee8f1c090d607a73bef5663108a65 Mon Sep 17 00:00:00 2001
From: dpeca <peca@mycity.rs>
Date: Fri, 9 Nov 2018 17:47:05 +0100
Subject: [PATCH 08/28] Ubuntu 18.04 dovecot namespace inbox fix

Fix based on https://github.com/serghey-rodin/vesta/pull/1669/files
---
 install/ubuntu/18.04/dovecot/dovecot.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/ubuntu/18.04/dovecot/dovecot.conf b/install/ubuntu/18.04/dovecot/dovecot.conf
index 311a3351..163460ba 100644
--- a/install/ubuntu/18.04/dovecot/dovecot.conf
+++ b/install/ubuntu/18.04/dovecot/dovecot.conf
@@ -3,7 +3,7 @@ listen = *, ::
 base_dir = /var/run/dovecot/
 !include conf.d/*.conf
 
-namespace {
+namespace inbox {
     type = private
     separator = /
     prefix =

From e799566c6ba1c84e6689cb016bbc0f05abda2767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:14:04 +0100
Subject: [PATCH 09/28] vary

vary, causes page speed issues
---
 install/debian/7/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/debian/7/nginx/nginx.conf b/install/debian/7/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/debian/7/nginx/nginx.conf
+++ b/install/debian/7/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 591bfdaad19b91ed73ddf93313123ecc3c1b035b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:14:39 +0100
Subject: [PATCH 10/28] Update nginx.conf

---
 install/debian/8/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/debian/8/nginx/nginx.conf b/install/debian/8/nginx/nginx.conf
index 1eef1672..e8967d8e 100644
--- a/install/debian/8/nginx/nginx.conf
+++ b/install/debian/8/nginx/nginx.conf
@@ -51,6 +51,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From a3982fd477136acfa66314de153eee66a464151e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:16:24 +0100
Subject: [PATCH 11/28] Update nginx.conf

vary on
---
 install/debian/9/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/debian/9/nginx/nginx.conf b/install/debian/9/nginx/nginx.conf
index 1eef1672..e8967d8e 100644
--- a/install/debian/9/nginx/nginx.conf
+++ b/install/debian/9/nginx/nginx.conf
@@ -51,6 +51,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 4d70c416ca7425076e58fc921b051123f58c8abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:17:02 +0100
Subject: [PATCH 12/28] Update nginx.conf

vary on
---
 install/rhel/7/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/rhel/7/nginx/nginx.conf b/install/rhel/7/nginx/nginx.conf
index e0575030..0a37ebbc 100644
--- a/install/rhel/7/nginx/nginx.conf
+++ b/install/rhel/7/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 49cf56972954ef9b3da144da60c1ab53007a6ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:17:31 +0100
Subject: [PATCH 13/28] Update nginx.conf

vary on
---
 install/rhel/6/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/rhel/6/nginx/nginx.conf b/install/rhel/6/nginx/nginx.conf
index e0575030..0a37ebbc 100644
--- a/install/rhel/6/nginx/nginx.conf
+++ b/install/rhel/6/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 812e001723fb1b62537d0b47daf3203f1f16c5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:18:06 +0100
Subject: [PATCH 14/28] Update nginx.conf

vary on
---
 install/rhel/5/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/rhel/5/nginx/nginx.conf b/install/rhel/5/nginx/nginx.conf
index e0575030..0a37ebbc 100644
--- a/install/rhel/5/nginx/nginx.conf
+++ b/install/rhel/5/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 4073325014f92dc1c34a43f5f36d5d0235eb29df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:20:21 +0100
Subject: [PATCH 15/28] Update nginx.conf

vary on
---
 install/ubuntu/12.04/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/12.04/nginx/nginx.conf b/install/ubuntu/12.04/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/12.04/nginx/nginx.conf
+++ b/install/ubuntu/12.04/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 151f82e51958ff3941d4c32209c7a2e3264eb599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:21:12 +0100
Subject: [PATCH 16/28] Update nginx.conf

vary on
---
 install/ubuntu/18.04/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/18.04/nginx/nginx.conf b/install/ubuntu/18.04/nginx/nginx.conf
index 790aee49..dc2cf1dd 100644
--- a/install/ubuntu/18.04/nginx/nginx.conf
+++ b/install/ubuntu/18.04/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_static         on;
     gzip_vary           on;
     gzip_comp_level     6;

From 61c439554e404fa124dc577c53649bb960e8b24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:21:38 +0100
Subject: [PATCH 17/28] Update nginx.conf

vary on
---
 install/ubuntu/17.10/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/17.10/nginx/nginx.conf b/install/ubuntu/17.10/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/17.10/nginx/nginx.conf
+++ b/install/ubuntu/17.10/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 433166a4776b25d4469316cce98f64452650b73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:22:32 +0100
Subject: [PATCH 18/28] Update nginx.conf

vary on
---
 install/ubuntu/17.04/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/17.04/nginx/nginx.conf b/install/ubuntu/17.04/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/17.04/nginx/nginx.conf
+++ b/install/ubuntu/17.04/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 46b7d8438fc3e477821c5004670c1918dab274ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:23:06 +0100
Subject: [PATCH 19/28] Update nginx.conf

vary on
---
 install/ubuntu/12.10/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/12.10/nginx/nginx.conf b/install/ubuntu/12.10/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/12.10/nginx/nginx.conf
+++ b/install/ubuntu/12.10/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From ef422f62f643b5212fc1543de82a407f95c65e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:23:19 +0100
Subject: [PATCH 20/28] Update nginx.conf

vary on
---
 install/ubuntu/13.04/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/13.04/nginx/nginx.conf b/install/ubuntu/13.04/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/13.04/nginx/nginx.conf
+++ b/install/ubuntu/13.04/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From ccc4e5a2626607e09d84a99e7c5bec11c9e6d337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:23:45 +0100
Subject: [PATCH 21/28] Update nginx.conf

vary on
---
 install/ubuntu/13.10/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/13.10/nginx/nginx.conf b/install/ubuntu/13.10/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/13.10/nginx/nginx.conf
+++ b/install/ubuntu/13.10/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 936b225b30382444ff45dd941597fa9ef570f76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:24:02 +0100
Subject: [PATCH 22/28] Update nginx.conf

vary on
---
 install/ubuntu/16.10/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/16.10/nginx/nginx.conf b/install/ubuntu/16.10/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/16.10/nginx/nginx.conf
+++ b/install/ubuntu/16.10/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From d6e0b4e18f39a8169df8ffe83db0b3541e888cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:24:17 +0100
Subject: [PATCH 23/28] Update nginx.conf

vary on
---
 install/ubuntu/16.04/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/16.04/nginx/nginx.conf b/install/ubuntu/16.04/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/16.04/nginx/nginx.conf
+++ b/install/ubuntu/16.04/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 0f1fb8aa43f3cf5c6947a0e9ceacf866f40a797d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:24:25 +0100
Subject: [PATCH 24/28] Update nginx.conf

---
 install/ubuntu/15.10/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/15.10/nginx/nginx.conf b/install/ubuntu/15.10/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/15.10/nginx/nginx.conf
+++ b/install/ubuntu/15.10/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 13d713ecc817e6a894609e25d26500532cb56fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:24:42 +0100
Subject: [PATCH 25/28] Update nginx.conf

---
 install/ubuntu/15.04/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/15.04/nginx/nginx.conf b/install/ubuntu/15.04/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/15.04/nginx/nginx.conf
+++ b/install/ubuntu/15.04/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From c82e50056d6f807a1f0056449b8f40c95e132c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:24:58 +0100
Subject: [PATCH 26/28] Update nginx.conf

vary on
---
 install/ubuntu/14.10/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/14.10/nginx/nginx.conf b/install/ubuntu/14.10/nginx/nginx.conf
index e7256de7..6bc999f9 100644
--- a/install/ubuntu/14.10/nginx/nginx.conf
+++ b/install/ubuntu/14.10/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From e67297010370a1a006815f18ea3a6a7e0ef86d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Wed, 14 Nov 2018 00:25:12 +0100
Subject: [PATCH 27/28] Update nginx.conf

vary on
---
 install/ubuntu/14.04/nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ubuntu/14.04/nginx/nginx.conf b/install/ubuntu/14.04/nginx/nginx.conf
index 1932d171..c44ab650 100644
--- a/install/ubuntu/14.04/nginx/nginx.conf
+++ b/install/ubuntu/14.04/nginx/nginx.conf
@@ -50,6 +50,7 @@ http {
 
     # Compression
     gzip                on;
+    gzip_vary           on;
     gzip_comp_level     9;
     gzip_min_length     512;
     gzip_buffers        8 64k;

From 0437c4ac3ee2056f2ed2fdfd10a6e6693b292699 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <skid@vestacp.com>
Date: Wed, 14 Nov 2018 17:53:48 +0200
Subject: [PATCH 28/28] fix backup exlustions for files

---
 bin/v-backup-user | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/bin/v-backup-user b/bin/v-backup-user
index f9569aa4..0c9e7c1b 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -216,6 +216,9 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
             cp $USER_DATA/ssl/$domain.* vesta/
         fi
 
+        # Changin dir to documentroot
+        cd $HOMEDIR/$user/web/$domain
+
         # Define exclude arguments
         exlusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain:")
         set -f
@@ -224,15 +227,21 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
         if [ ! -z "$exlusion" ]; then
             xdirs="$(echo -e "$exlusion" |tr ':' '\n' |grep -v $domain)"
             for xpath in $xdirs; do
-                fargs+=(--exclude=$xpath/*)
-                echo "$(date "+%F %T") excluding directory $xpath"
-                msg="$msg\n$(date "+%F %T") excluding directory $xpath"
+            for xpath in $xdirs; do
+                if [ -d "$xpath" ]; then
+                    fargs+=(--exclude=$xpath/*)
+                    echo "$(date "+%F %T") excluding directory $xpath"
+                    msg="$msg\n$(date "+%F %T") excluding directory $xpath"
+                else
+                    echo "$(date "+%F %T") excluding file $xpath"
+                    msg="$msg\n$(date "+%F %T") excluding file $xpath"
+                    fargs+=(--exclude=$xpath)
+                fi
             done
         fi
         set +f
 
         # Backup files
-        cd $HOMEDIR/$user/web/$domain
         tar -cpf- * ${fargs[@]} |gzip -$BACKUP_GZIP - > $tmpdir/web/$domain/domain_data.tar.gz
     done