From 969ca7e15b6a4862d796338663b691aa2ab4e214 Mon Sep 17 00:00:00 2001
From: Scorcher <nikolay.didenko@gmail.com>
Date: Sun, 28 Feb 2016 15:58:53 +0500
Subject: [PATCH 01/13] Fix hole in iptables: connect to any ports from defined
 in rules ports.

---
 bin/v-update-firewall | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/bin/v-update-firewall b/bin/v-update-firewall
index 04a15a5f..7babd84d 100755
--- a/bin/v-update-firewall
+++ b/bin/v-update-firewall
@@ -64,6 +64,19 @@ tmp=$(mktemp)
 echo "$iptables -P INPUT ACCEPT" >> $tmp
 echo "$iptables -F INPUT" >> $tmp
 
+# Enabling stateful support
+if [ "$conntrack" != 'no' ]; then
+    str="$iptables -A INPUT -m state"
+    str="$str --state ESTABLISHED,RELATED -j ACCEPT"
+    echo "$str" >> $tmp
+fi
+
+# Handling local traffic
+for ip in $(ls $VESTA/data/ips); do
+    echo "$iptables -A INPUT -s $ip -j ACCEPT" >> $tmp
+done
+echo "$iptables -A INPUT -s 127.0.0.1 -j ACCEPT" >> $tmp
+
 # Pasring iptables rules
 IFS=$'\n'
 for line in $(sort -r -n -k 2 -t \' $rules); do
@@ -100,25 +113,6 @@ for line in $(sort -r -n -k 2 -t \' $rules); do
     fi
 done
 
-# Handling local traffic
-for ip in $(ls $VESTA/data/ips); do
-    echo "$iptables -A INPUT -s $ip -j ACCEPT" >> $tmp
-done
-echo "$iptables -A INPUT -s 127.0.0.1 -j ACCEPT" >> $tmp
-IFS=$'\n'
-for p_rule in $(cat $ports); do
-    eval $p_rule
-    rule="$iptables -A INPUT -p $PROTOCOL"
-    echo "$rule --sport $PORT -j ACCEPT" >> $tmp
-done
-
-# Enabling stateful support
-if [ "$conntrack" != 'no' ]; then
-    str="$iptables -A INPUT -p tcp -m state"
-    str="$str --state ESTABLISHED,RELATED -j ACCEPT"
-    echo "$str" >> $tmp
-fi
-
 # Switching chain policy to DROP
 echo "$iptables -P INPUT DROP" >> $tmp
 

From 9c655bfcf300aa21fb55a87ebd137b18cb6689b2 Mon Sep 17 00:00:00 2001
From: Roman Sadoyan <rs@rosa.pro>
Date: Sat, 26 Mar 2016 14:13:15 +0300
Subject: [PATCH 02/13] MODX nginx template added

---
 .../7/templates/web/nginx/php5-fpm/modx.stpl  | 64 +++++++++++++++++++
 .../7/templates/web/nginx/php5-fpm/modx.tpl   | 60 +++++++++++++++++
 .../8/templates/web/nginx/php5-fpm/modx.stpl  | 64 +++++++++++++++++++
 .../8/templates/web/nginx/php5-fpm/modx.tpl   | 60 +++++++++++++++++
 .../5/templates/web/nginx/php-fpm/modx.stpl   | 64 +++++++++++++++++++
 .../5/templates/web/nginx/php-fpm/modx.tpl    | 60 +++++++++++++++++
 .../6/templates/web/nginx/php-fpm/modx.stpl   | 64 +++++++++++++++++++
 .../6/templates/web/nginx/php-fpm/modx.tpl    | 60 +++++++++++++++++
 .../7/templates/web/nginx/php-fpm/modx.stpl   | 64 +++++++++++++++++++
 .../7/templates/web/nginx/php-fpm/modx.tpl    | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.stpl    | 64 +++++++++++++++++++
 .../templates/web/nginx/php5-fpm/modx.tpl     | 60 +++++++++++++++++
 26 files changed, 1612 insertions(+)
 create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/modx.stpl
 create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/modx.tpl
 create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/modx.stpl
 create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/modx.tpl
 create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/modx.stpl
 create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/modx.tpl
 create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl
 create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl
 create mode 100644 install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl

diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..a56fe12b
--- /dev/null
+++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+	
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl
new file mode 100644
index 00000000..b8dfc44d
--- /dev/null
+++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.stpl
@@ -0,0 +1,64 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  https://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+	location ~ \.php$ {
+        	try_files $uri =404;
+            fastcgi_pass %backend_lsnr%;
+            fastcgi_index index.php;
+		    fastcgi_param SCRIPT_FILENAME $request_filename;
+            include /etc/nginx/fastcgi_params;
+        }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}
diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl
new file mode 100644
index 00000000..5928cd0e
--- /dev/null
+++ b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/modx.tpl
@@ -0,0 +1,60 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+#   if you need to rewrite www to non-www uncomment bellow
+#   if ($host != '%domain%' ) {
+#       rewrite      ^/(.*)$  http://%domain%/$1  permanent;
+#    }
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+    }
+    location @rewrite {
+        rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_pass %backend_lsnr%;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}

From f0af705f92715c0ad7f0f37fcd3c48528a527fdb Mon Sep 17 00:00:00 2001
From: Nguyen Ngoc Phuong <nguyenngocphuongnb@gmail.com>
Date: Fri, 1 Apr 2016 00:41:12 +0700
Subject: [PATCH 03/13] Correct wrong spelling

---
 web/inc/i18n/vi.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php
index 5b04a74b..f009d0be 100644
--- a/web/inc/i18n/vi.php
+++ b/web/inc/i18n/vi.php
@@ -315,7 +315,7 @@ $LANG['vi'] = array(
     'IP address'  => 'Địa chỉ IP',
     'netmask'  => 'netmask',
     'interface'  => 'Giao tiếp',
-    'assigned user'  => 'người dùng đơ]cj chỉ định',
+    'assigned user'  => 'người dùng được chỉ định',
     'ns1'  => 'ns1',
     'ns2'  => 'ns2',
     'user'  => 'tài khoản',

From 19bf969b840b20e9f8e787571ed36d854a93b9f9 Mon Sep 17 00:00:00 2001
From: Josue Alexander Ibarra <josue@elninja.com>
Date: Sat, 2 Apr 2016 11:59:29 -0700
Subject: [PATCH 04/13] Fixing exim auto reply bug for ubuntu and debian as
 stated in issue #198

---
 install/debian/7/exim/exim4.conf.template     | 2 +-
 install/debian/8/exim/exim4.conf.template     | 2 +-
 install/ubuntu/12.04/exim/exim4.conf.template | 2 +-
 install/ubuntu/12.10/exim/exim4.conf.template | 2 +-
 install/ubuntu/13.04/exim/exim4.conf.template | 2 +-
 install/ubuntu/13.10/exim/exim4.conf.template | 2 +-
 install/ubuntu/14.04/exim/exim4.conf.template | 2 +-
 install/ubuntu/14.10/exim/exim4.conf.template | 2 +-
 install/ubuntu/15.04/exim/exim4.conf.template | 2 +-
 install/ubuntu/15.10/exim/exim4.conf.template | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/install/debian/7/exim/exim4.conf.template b/install/debian/7/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/debian/7/exim/exim4.conf.template
+++ b/install/debian/7/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/debian/8/exim/exim4.conf.template b/install/debian/8/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/debian/8/exim/exim4.conf.template
+++ b/install/debian/8/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/12.04/exim/exim4.conf.template b/install/ubuntu/12.04/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/12.04/exim/exim4.conf.template
+++ b/install/ubuntu/12.04/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/12.10/exim/exim4.conf.template b/install/ubuntu/12.10/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/12.10/exim/exim4.conf.template
+++ b/install/ubuntu/12.10/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/13.04/exim/exim4.conf.template b/install/ubuntu/13.04/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/13.04/exim/exim4.conf.template
+++ b/install/ubuntu/13.04/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/13.10/exim/exim4.conf.template b/install/ubuntu/13.10/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/13.10/exim/exim4.conf.template
+++ b/install/ubuntu/13.10/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/14.04/exim/exim4.conf.template b/install/ubuntu/14.04/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/14.04/exim/exim4.conf.template
+++ b/install/ubuntu/14.04/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/14.10/exim/exim4.conf.template b/install/ubuntu/14.10/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/14.10/exim/exim4.conf.template
+++ b/install/ubuntu/14.10/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/15.04/exim/exim4.conf.template b/install/ubuntu/15.04/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/15.04/exim/exim4.conf.template
+++ b/install/ubuntu/15.04/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/ubuntu/15.10/exim/exim4.conf.template b/install/ubuntu/15.10/exim/exim4.conf.template
index 742f0409..10359a15 100644
--- a/install/ubuntu/15.10/exim/exim4.conf.template
+++ b/install/ubuntu/15.10/exim/exim4.conf.template
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen

From a13bcf5322da612ea9ccbecbd9f115d3cf1c92cd Mon Sep 17 00:00:00 2001
From: Roman Florea <roman.florea@tut.fi>
Date: Sat, 2 Apr 2016 22:57:45 +0300
Subject: [PATCH 05/13] Fixing exim auto reply bug for rhel as stated in issue
 #198

---
 install/rhel/5/exim/exim.conf | 2 +-
 install/rhel/6/exim/exim.conf | 2 +-
 install/rhel/7/exim/exim.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/rhel/5/exim/exim.conf b/install/rhel/5/exim/exim.conf
index 0f983016..6f9a7388 100644
--- a/install/rhel/5/exim/exim.conf
+++ b/install/rhel/5/exim/exim.conf
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/rhel/6/exim/exim.conf b/install/rhel/6/exim/exim.conf
index 0f983016..6f9a7388 100644
--- a/install/rhel/6/exim/exim.conf
+++ b/install/rhel/6/exim/exim.conf
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen
diff --git a/install/rhel/7/exim/exim.conf b/install/rhel/7/exim/exim.conf
index 0f983016..6f9a7388 100644
--- a/install/rhel/7/exim/exim.conf
+++ b/install/rhel/7/exim/exim.conf
@@ -227,7 +227,7 @@ procmail:
 autoreplay:
   driver = accept
   require_files = /etc/exim/domains/$domain/autoreply.${local_part}.msg
-  condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}}{yes}{no}}
+  condition = ${if exists{/etc/exim/domains/$domain/autoreply.${local_part}.msg}{yes}{no}}
   retry_use_local_part
   transport = userautoreply
   unseen

From ea22b393caf2897caef7842244e913fb183a8bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20BRY?= <herve.bry@geneanet.org>
Date: Fri, 22 Apr 2016 16:30:27 +0200
Subject: [PATCH 06/13] Handle DES passwords

---
 bin/v-check-user-password    | 25 ++++++++++++++++++-------
 bin/v-generate-password-hash |  5 +++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/bin/v-check-user-password b/bin/v-check-user-password
index 1eecc3dd..c84f3bb4 100755
--- a/bin/v-check-user-password
+++ b/bin/v-check-user-password
@@ -49,13 +49,24 @@ fi
 #----------------------------------------------------------#
 
 # Parsing user's salt
-shadow=$(grep "^$user:" /etc/shadow)
-salt=$(echo "$shadow" |cut -f 3 -d \$)
-method=$(echo "$shadow" |cut -f 2 -d \$)
-if [ "$method" -eq '1' ]; then
-    method='md5'
+shadow=$(grep "^$user:" /etc/shadow | cut -f 2 -d :)
+
+if echo "$shadow" | grep -qE '^\$[0-9a-z]+\$[^\$]+\$'
+then
+    salt=$(echo "$shadow" |cut -f 3 -d \$)
+    method=$(echo "$shadow" |cut -f 2 -d \$)
+    if [ "$method" -eq '1' ]; then
+        method='md5'
+    elif [ "$method" -eq '6' ]; then
+        method='sha-512'
+    else
+        echo "Error: password missmatch"
+        echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
+        exit 9
+    fi
 else
-    method='sha-512'
+    salt=${shadow:0:2}
+    method='des'
 fi
 
 if [ -z "$salt" ]; then
@@ -64,7 +75,7 @@ if [ -z "$salt" ]; then
     exit 9
 fi
 
-# Generating SHA-512
+# Generating hash
 hash=$($BIN/v-generate-password-hash $method $salt <<< $password)
 if [[ -z "$hash" ]]; then
     echo "Error: password missmatch"
diff --git a/bin/v-generate-password-hash b/bin/v-generate-password-hash
index fd917ad3..78a551fe 100755
--- a/bin/v-generate-password-hash
+++ b/bin/v-generate-password-hash
@@ -37,5 +37,10 @@ if ($crypt == 'htpasswd' ) {
     $hash = crypt($password, base64_encode($password));
 }
 
+// Generating DES hash
+if ($crypt == 'des' ) {
+    $hash = crypt($password, $salt);
+}
+
 // Printing result
 echo $hash . "\n";

From 3bf6a399a5c160c0ca5d5f5d209257130f11d377 Mon Sep 17 00:00:00 2001
From: neil <github@byneil.com>
Date: Tue, 26 Apr 2016 23:12:35 +0800
Subject: [PATCH 07/13] make path first, in case the part doesn't exist.

make path first, in case the part doesn't exist.
---
 bin/v-add-backup-host | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host
index 5595c043..39a79046 100755
--- a/bin/v-add-backup-host
+++ b/bin/v-add-backup-host
@@ -137,8 +137,10 @@ if [ "$type" = 'sftp' ]; then
     if [ -z $port ]; then
         port=22
     fi
-    sftmpdir="$path/vst.bK76A9SUkt"
-    sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1
+    if sftpc "mkdir $path" > /dev/null 2>&1 ; then
+        sftmpdir="$path/vst.bK76A9SUkt"
+        sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1
+    fi
     rc=$?
     if [[ "$rc" != 0 ]]; then
         case $rc in

From 9f1ea16dc89f74f06851ca53c91efb15afc43e86 Mon Sep 17 00:00:00 2001
From: MartinG <martin@raiolanetworks.es>
Date: Fri, 29 Apr 2016 04:11:14 +0200
Subject: [PATCH 08/13] Update vst-install-debian.sh

---
 install/vst-install-debian.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index 0c972c79..9f27ef4a 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -13,7 +13,7 @@ VERSION='debian'
 memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9])
 arch=$(uname -i)
 os='debian'
-release=$(cat /etc/issue|grep -o [0-9]|head -n1)
+release=$(cat /etc/debian_version|grep -o [0-9]|head -n1)
 codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))"
 vestacp="http://$CHOST/$VERSION/$release"
 

From 170bd64ec2a36c8d237cc1ab32aa37d46b964b13 Mon Sep 17 00:00:00 2001
From: olshek <me@olshek.com>
Date: Wed, 4 May 2016 14:13:36 +0300
Subject: [PATCH 09/13] improved regular expression in v-backup-user file

The regular expression now uses exact match of a folder/file name.
With the previous version, some files were ignored during the backup process(for example .gitconfig, because it contains "conf").
---
 bin/v-backup-user | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/v-backup-user b/bin/v-backup-user
index 0a335da4..425a659f 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -479,7 +479,7 @@ if [ "$USER" != '*' ]; then
     set -f
     i=0
 
-    for udir in $(ls -a |egrep -v "conf|web|dns|mail|^\.\.$|^\.$"); do
+    for udir in $(ls -a |egrep -v "^conf$|^web$|^dns$|^mail$|^\.\.$|^\.$"); do
         exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$")
         if [ -z "$exclusion" ]; then
             ((i ++))

From 449fd9764462270a459cb34ccaee722e532c6963 Mon Sep 17 00:00:00 2001
From: Disketsa - Azuya <azuya@users.noreply.github.com>
Date: Sun, 8 May 2016 14:19:20 +0700
Subject: [PATCH 10/13] Update edit_package.html

After save the package, back button link is referer to https://dimain/list/package/?package={package_name}
i think we dont need this. Back button will alway go to /list/package/ ....
 CMIIW ....
---
 web/templates/admin/edit_package.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index bbdcba30..0655ba34 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -22,12 +22,7 @@
 
     <div class="l-center">
       <?php
-        $back = getenv("HTTP_REFERER");
-        if (empty($back)) {
-          $back = "location.href='/list/package/'";
-        } else {
-          $back = "location.href='".$back."'";
-        }
+        $back = "location.href='/list/package/'";
       ?>
         <form id="vstobjects" name="v_edit_package" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />

From 30186527077e6cb3fb0a9d23b8304ebbe18b938f Mon Sep 17 00:00:00 2001
From: Rune Laenen <runelaenen@hotmail.com>
Date: Sun, 8 May 2016 14:52:08 +0200
Subject: [PATCH 11/13] Fix wrong documentation

---
 bin/v-list-sys-vesta-autoupdate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/v-list-sys-vesta-autoupdate b/bin/v-list-sys-vesta-autoupdate
index ba89029f..a221640a 100755
--- a/bin/v-list-sys-vesta-autoupdate
+++ b/bin/v-list-sys-vesta-autoupdate
@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: list vesta autoupdate settings
-# options: NONE
+# options: [FORMAT]
 #
 # The function for obtaining autoupdate setings.
 

From 6dcfc8a3dc0df0bd4b43b29064d54a983772ec07 Mon Sep 17 00:00:00 2001
From: martijndedood <info@martijndedood.net>
Date: Tue, 31 May 2016 21:45:38 +0200
Subject: [PATCH 12/13] no-php.tpl # comment replaced with ; comment

---
 .../7/templates/web/php5-fpm/no-php.tpl       | 22 +++++++++----------
 .../8/templates/web/php5-fpm/no-php.tpl       | 22 +++++++++----------
 .../rhel/5/templates/web/php-fpm/no-php.tpl   | 22 +++++++++----------
 .../rhel/6/templates/web/php-fpm/no-php.tpl   | 22 +++++++++----------
 .../rhel/7/templates/web/php-fpm/no-php.tpl   | 22 +++++++++----------
 .../12.04/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 .../12.10/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 .../13.04/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 .../13.10/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 .../14.04/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 .../14.10/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 .../15.04/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 .../15.10/templates/web/php5-fpm/no-php.tpl   | 22 +++++++++----------
 13 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/install/debian/7/templates/web/php5-fpm/no-php.tpl b/install/debian/7/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/debian/7/templates/web/php5-fpm/no-php.tpl
+++ b/install/debian/7/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/debian/8/templates/web/php5-fpm/no-php.tpl b/install/debian/8/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/debian/8/templates/web/php5-fpm/no-php.tpl
+++ b/install/debian/8/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/rhel/5/templates/web/php-fpm/no-php.tpl b/install/rhel/5/templates/web/php-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/rhel/5/templates/web/php-fpm/no-php.tpl
+++ b/install/rhel/5/templates/web/php-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/rhel/6/templates/web/php-fpm/no-php.tpl b/install/rhel/6/templates/web/php-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/rhel/6/templates/web/php-fpm/no-php.tpl
+++ b/install/rhel/6/templates/web/php-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/rhel/7/templates/web/php-fpm/no-php.tpl b/install/rhel/7/templates/web/php-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/rhel/7/templates/web/php-fpm/no-php.tpl
+++ b/install/rhel/7/templates/web/php-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/12.04/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/12.10/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/13.04/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/13.10/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/14.04/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/14.10/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/15.04/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10
diff --git a/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl
index 89487d5f..e677f3e9 100644
--- a/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl
+++ b/install/ubuntu/15.10/templates/web/php5-fpm/no-php.tpl
@@ -1,13 +1,13 @@
-#[%backend%]
-#user = %user%
-#group = %user%
-#listen = /dev/null
+;[%backend%]
+;user = %user%
+;group = %user%
+;listen = /dev/null
 
-#listen.owner = %user%
-#listen.group = nginx
+;listen.owner = %user%
+;listen.group = nginx
 
-#pm = dynamic
-#pm.max_children = 50
-#pm.start_servers = 3
-#pm.min_spare_servers = 2
-#pm.max_spare_servers = 10
+;pm = dynamic
+;pm.max_children = 50
+;pm.start_servers = 3
+;pm.min_spare_servers = 2
+;pm.max_spare_servers = 10

From c23924e987e31a358816f053494943d40967a19c Mon Sep 17 00:00:00 2001
From: Flat <flatta@outlook.jp>
Date: Sun, 26 Jun 2016 20:58:20 +0900
Subject: [PATCH 13/13] Remove redundant quotes in .html files

---
 web/templates/admin/add_ip.html        |  8 ++++----
 web/templates/admin/list_backup.html   |  2 +-
 web/templates/admin/list_cron.html     |  2 +-
 web/templates/admin/list_db.html       |  2 +-
 web/templates/admin/list_dns.html      |  2 +-
 web/templates/admin/list_dns_rec.html  |  2 +-
 web/templates/admin/list_firewall.html |  2 +-
 web/templates/admin/list_ip.html       | 12 ++++++------
 web/templates/admin/list_mail.html     |  2 +-
 web/templates/admin/list_mail_acc.html |  2 +-
 web/templates/admin/list_packages.html |  2 +-
 web/templates/admin/list_search.html   |  6 +++---
 web/templates/admin/list_services.html |  2 +-
 web/templates/admin/list_user.html     |  4 ++--
 web/templates/admin/list_web.html      |  2 +-
 web/templates/user/list_cron.html      |  2 +-
 web/templates/user/list_db.html        |  2 +-
 web/templates/user/list_dns.html       |  2 +-
 web/templates/user/list_dns_rec.html   |  2 +-
 web/templates/user/list_mail.html      |  2 +-
 web/templates/user/list_mail_acc.html  |  2 +-
 web/templates/user/list_search.html    |  4 ++--
 web/templates/user/list_user.html      |  4 ++--
 web/templates/user/list_web.html       |  2 +-
 24 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index 82eb13ab..43b37d5d 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -54,7 +54,7 @@
                         <table class="data-col2" width="600px">
                             <tr>
                                 <td class="vst-text step-top">
-                                    <?php print __('IP address') ?> 
+                                    <?php print __('IP address') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -86,7 +86,7 @@
                                                 if ((!empty($v_interface)) && ( $value == $v_interface )) echo ' selected';
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -131,7 +131,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('NAT IP association');?> <span class="optional"">(<?php print __('optional');?>)</span>
+                                    <?php print __('NAT IP association');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
                             <tr>
@@ -156,4 +156,4 @@
                 </tr>
             </table>
         </form>
-      </div>
\ No newline at end of file
+      </div>
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 7fd90839..365a816f 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -100,7 +100,7 @@
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('outdated')?></div>
+          <div class="l-unit__suspended"><?=__('outdated')?></div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index f9ec0581..c05aa8ed 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -124,7 +124,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 7fc51d7e..4e5e5140 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -152,7 +152,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 78ae5111..7f25b0d3 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -114,7 +114,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index 244c1d4a..e4b55877 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -98,7 +98,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
         <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center jump-small-top">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 2c4b365e..73990d58 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -113,7 +113,7 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
         <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 3906a46f..ada609a2 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -60,9 +60,9 @@
            ++$i;
       ?>
 
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['IP'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" 
-v_section="ip" sort-ip="<?=str_replace('.', '', $key)?>" sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>" 
-sort-netmask="<?=str_replace('.', '', $data[$key]['NETMASK'])?>" sort-interface="<?=__($data[$key]['INTERFACE'])?>" sort-domains="<?=$data[$key]['U_WEB_DOMAINS']?>" 
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['IP'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>"
+v_section="ip" sort-ip="<?=str_replace('.', '', $key)?>" sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>"
+sort-netmask="<?=str_replace('.', '', $data[$key]['NETMASK'])?>" sort-interface="<?=__($data[$key]['INTERFACE'])?>" sort-domains="<?=$data[$key]['U_WEB_DOMAINS']?>"
 sort-owner="<?=__($data[$key]['OWNER'])?>" sort-star="<? if($_SESSION['favourites']['IP'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
@@ -72,8 +72,8 @@ sort-owner="<?=__($data[$key]['OWNER'])?>" sort-star="<? if($_SESSION['favourite
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
-              <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href""><a href="/edit/ip/?ip=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js"">
+              <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/ip/?ip=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
+              <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                 <a id="delete_link_<?=$i?>" class="data-controls do_delete">
                   <?=__('delete')?> <i class="do_delete"></i>
                   <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" />
@@ -94,7 +94,7 @@ sort-owner="<?=__($data[$key]['OWNER'])?>" sort-star="<? if($_SESSION['favourite
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 61f12728..27285db5 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -133,7 +133,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 07b0529c..9607d127 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -126,7 +126,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index 4428f1da..d06f0608 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -90,7 +90,7 @@ sort-star="<?if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo '1'; else ec
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index daff2376..3db736d3 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -74,7 +74,7 @@
               if ($data[$key]['USER'] != $user && $data[$key]['KEY'] == 'ACCOUNT') {
                 if ($key == $user) {
             ?>
-                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout""><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
                 <?
                   if (!empty($_SESSION['look_alert'])) {
                 ?>
@@ -203,7 +203,7 @@
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
@@ -270,4 +270,4 @@
           </div>
         </div>
       </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index aad7961a..aa85671c 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -65,7 +65,7 @@
         <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <!-- div class="l-unit__date">
           </div-->
         </div>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index d12ef7c8..ae0651af 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -95,7 +95,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
             <?
               if ($key == $user) {
             ?>
-                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout""><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
               <?
                 if (!empty($_SESSION['look_alert'])) {
               ?>
@@ -162,7 +162,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 9415aa2e..7f610b1a 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -169,7 +169,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index e3a73e22..757725ad 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -111,7 +111,7 @@ sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-nam
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index c03e83b2..2a80f7ab 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -141,7 +141,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="l-unit__suspended"><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 616313ab..ce5c12a5 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -103,7 +103,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index fe91f49f..2cf428a4 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -96,7 +96,7 @@
         <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center jump-small-top">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 9eac082b..09afc610 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -121,7 +121,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 0af018cf..70bc38dc 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -114,7 +114,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index 5545f205..a8909b29 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -73,7 +73,7 @@
               if ($data[$key]['USER'] != $user && $data[$key]['KEY'] == 'ACCOUNT') {
                 if ($key == $user) {
             ?>
-                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout""><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
                 <?
                   if (!empty($_SESSION['look_alert'])) {
                 ?>
@@ -168,7 +168,7 @@
           <div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index d0dda28c..e71d286a 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -93,7 +93,7 @@ sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['
             <?
               if ($key == $user) {
             ?>
-                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout""><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
               <?
                 if (!empty($_SESSION['look_alert'])) {
               ?>
@@ -150,7 +150,7 @@ sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index eb78d638..9f08d0ab 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -161,7 +161,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <div class="l-unit__date" u_date="<?=strtotime('1/1/2011')?>">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>