diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl
index d4108f94..7fe91bc7 100755
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@@ -58,6 +58,7 @@ del_web_config
# Add new vhost
PROXY="$template"
PROXY_EXT="$extentions"
+tpl_file="$WEBTPL/$PROXY_SYSTEM/$template.tpl"
upd_web_domain_values
add_web_config
chown root:$user $conf
diff --git a/install/0.9.7/rhel/templates/dns/default.tpl b/install/0.9.7/rhel/templates/dns/default.tpl
deleted file mode 100755
index 314ec010..00000000
--- a/install/0.9.7/rhel/templates/dns/default.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-ID='11' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='12' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='13' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='14' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='21' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='22' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='23' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='24' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='25' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='26' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='27' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%'
diff --git a/install/0.9.7/rhel/templates/dns/gmail.tpl b/install/0.9.7/rhel/templates/dns/gmail.tpl
deleted file mode 100755
index c8ad4f26..00000000
--- a/install/0.9.7/rhel/templates/dns/gmail.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-ID='11' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='12' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='13' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='14' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='21' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='22' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='23' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='24' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='ghs.google.com.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='25' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='26' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='27' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='28' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='29' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='30' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ASPMX2.GOOGLEMAIL.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='31' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ASPMX3.GOOGLEMAIL.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
-ID='32' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%'
diff --git a/install/0.9.7/rhel/apc.ini b/install/0.9.8/rhel/apc.ini
similarity index 100%
rename from install/0.9.7/rhel/apc.ini
rename to install/0.9.8/rhel/apc.ini
diff --git a/install/0.9.7/rhel/clamd.conf b/install/0.9.8/rhel/clamd.conf
similarity index 100%
rename from install/0.9.7/rhel/clamd.conf
rename to install/0.9.8/rhel/clamd.conf
diff --git a/install/0.9.7/rhel/dnsbl.conf b/install/0.9.8/rhel/dnsbl.conf
similarity index 100%
rename from install/0.9.7/rhel/dnsbl.conf
rename to install/0.9.8/rhel/dnsbl.conf
diff --git a/install/0.9.7/rhel/dovecot.conf b/install/0.9.8/rhel/dovecot.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot.conf
rename to install/0.9.8/rhel/dovecot.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/10-auth.conf b/install/0.9.8/rhel/dovecot/conf.d/10-auth.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/10-auth.conf
rename to install/0.9.8/rhel/dovecot/conf.d/10-auth.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/10-logging.conf b/install/0.9.8/rhel/dovecot/conf.d/10-logging.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/10-logging.conf
rename to install/0.9.8/rhel/dovecot/conf.d/10-logging.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/10-mail.conf b/install/0.9.8/rhel/dovecot/conf.d/10-mail.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/10-mail.conf
rename to install/0.9.8/rhel/dovecot/conf.d/10-mail.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/10-master.conf b/install/0.9.8/rhel/dovecot/conf.d/10-master.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/10-master.conf
rename to install/0.9.8/rhel/dovecot/conf.d/10-master.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/10-ssl.conf b/install/0.9.8/rhel/dovecot/conf.d/10-ssl.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/10-ssl.conf
rename to install/0.9.8/rhel/dovecot/conf.d/10-ssl.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/20-imap.conf b/install/0.9.8/rhel/dovecot/conf.d/20-imap.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/20-imap.conf
rename to install/0.9.8/rhel/dovecot/conf.d/20-imap.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/20-pop3.conf b/install/0.9.8/rhel/dovecot/conf.d/20-pop3.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/20-pop3.conf
rename to install/0.9.8/rhel/dovecot/conf.d/20-pop3.conf
diff --git a/install/0.9.7/rhel/dovecot/conf.d/auth-passwdfile.conf.ext b/install/0.9.8/rhel/dovecot/conf.d/auth-passwdfile.conf.ext
similarity index 100%
rename from install/0.9.7/rhel/dovecot/conf.d/auth-passwdfile.conf.ext
rename to install/0.9.8/rhel/dovecot/conf.d/auth-passwdfile.conf.ext
diff --git a/install/0.9.7/rhel/dovecot/dovecot.conf b/install/0.9.8/rhel/dovecot/dovecot.conf
similarity index 100%
rename from install/0.9.7/rhel/dovecot/dovecot.conf
rename to install/0.9.8/rhel/dovecot/dovecot.conf
diff --git a/install/0.9.7/rhel/exim.conf b/install/0.9.8/rhel/exim.conf
similarity index 100%
rename from install/0.9.7/rhel/exim.conf
rename to install/0.9.8/rhel/exim.conf
diff --git a/install/0.9.7/rhel/freshclam.conf b/install/0.9.8/rhel/freshclam.conf
similarity index 100%
rename from install/0.9.7/rhel/freshclam.conf
rename to install/0.9.8/rhel/freshclam.conf
diff --git a/install/0.9.7/rhel/httpd-pma.conf b/install/0.9.8/rhel/httpd-pma.conf
similarity index 100%
rename from install/0.9.7/rhel/httpd-pma.conf
rename to install/0.9.8/rhel/httpd-pma.conf
diff --git a/install/0.9.7/rhel/httpd-ssl.conf b/install/0.9.8/rhel/httpd-ssl.conf
similarity index 100%
rename from install/0.9.7/rhel/httpd-ssl.conf
rename to install/0.9.8/rhel/httpd-ssl.conf
diff --git a/install/0.9.7/rhel/httpd-status.conf b/install/0.9.8/rhel/httpd-status.conf
similarity index 100%
rename from install/0.9.7/rhel/httpd-status.conf
rename to install/0.9.8/rhel/httpd-status.conf
diff --git a/install/0.9.7/rhel/httpd-webmail.conf b/install/0.9.8/rhel/httpd-webmail.conf
similarity index 100%
rename from install/0.9.7/rhel/httpd-webmail.conf
rename to install/0.9.8/rhel/httpd-webmail.conf
diff --git a/install/0.9.7/rhel/httpd.conf b/install/0.9.8/rhel/httpd.conf
similarity index 100%
rename from install/0.9.7/rhel/httpd.conf
rename to install/0.9.8/rhel/httpd.conf
diff --git a/install/0.9.7/rhel/httpd.log b/install/0.9.8/rhel/httpd.log
similarity index 100%
rename from install/0.9.7/rhel/httpd.log
rename to install/0.9.8/rhel/httpd.log
diff --git a/install/0.9.7/rhel/monit/clamd.conf b/install/0.9.8/rhel/monit/clamd.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/clamd.conf
rename to install/0.9.8/rhel/monit/clamd.conf
diff --git a/install/0.9.7/rhel/monit/dovecot.conf b/install/0.9.8/rhel/monit/dovecot.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/dovecot.conf
rename to install/0.9.8/rhel/monit/dovecot.conf
diff --git a/install/0.9.7/rhel/monit/exim.conf b/install/0.9.8/rhel/monit/exim.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/exim.conf
rename to install/0.9.8/rhel/monit/exim.conf
diff --git a/install/0.9.7/rhel/monit/httpd.conf b/install/0.9.8/rhel/monit/httpd.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/httpd.conf
rename to install/0.9.8/rhel/monit/httpd.conf
diff --git a/install/0.9.7/rhel/monit/mysql.conf b/install/0.9.8/rhel/monit/mysql.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/mysql.conf
rename to install/0.9.8/rhel/monit/mysql.conf
diff --git a/install/0.9.7/rhel/monit/nginx.conf b/install/0.9.8/rhel/monit/nginx.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/nginx.conf
rename to install/0.9.8/rhel/monit/nginx.conf
diff --git a/install/0.9.7/rhel/monit/spamassassin.conf b/install/0.9.8/rhel/monit/spamassassin.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/spamassassin.conf
rename to install/0.9.8/rhel/monit/spamassassin.conf
diff --git a/install/0.9.7/rhel/monit/sshd.conf b/install/0.9.8/rhel/monit/sshd.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/sshd.conf
rename to install/0.9.8/rhel/monit/sshd.conf
diff --git a/install/0.9.7/rhel/monit/vesta-nginx.conf b/install/0.9.8/rhel/monit/vesta-nginx.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/vesta-nginx.conf
rename to install/0.9.8/rhel/monit/vesta-nginx.conf
diff --git a/install/0.9.7/rhel/monit/vesta-php.conf b/install/0.9.8/rhel/monit/vesta-php.conf
similarity index 100%
rename from install/0.9.7/rhel/monit/vesta-php.conf
rename to install/0.9.8/rhel/monit/vesta-php.conf
diff --git a/install/0.9.7/rhel/mysql-512.cnf b/install/0.9.8/rhel/mysql-512.cnf
similarity index 100%
rename from install/0.9.7/rhel/mysql-512.cnf
rename to install/0.9.8/rhel/mysql-512.cnf
diff --git a/install/0.9.7/rhel/mysql.cnf b/install/0.9.8/rhel/mysql.cnf
similarity index 100%
rename from install/0.9.7/rhel/mysql.cnf
rename to install/0.9.8/rhel/mysql.cnf
diff --git a/install/0.9.7/rhel/named.conf b/install/0.9.8/rhel/named.conf
similarity index 100%
rename from install/0.9.7/rhel/named.conf
rename to install/0.9.8/rhel/named.conf
diff --git a/install/0.9.7/rhel/nginx-status.conf b/install/0.9.8/rhel/nginx-status.conf
similarity index 100%
rename from install/0.9.7/rhel/nginx-status.conf
rename to install/0.9.8/rhel/nginx-status.conf
diff --git a/install/0.9.7/rhel/nginx.conf b/install/0.9.8/rhel/nginx.conf
similarity index 83%
rename from install/0.9.7/rhel/nginx.conf
rename to install/0.9.8/rhel/nginx.conf
index c201f0bb..f33a8f7b 100644
--- a/install/0.9.7/rhel/nginx.conf
+++ b/install/0.9.8/rhel/nginx.conf
@@ -37,7 +37,8 @@ http {
'"$status" $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
log_format bytes '$body_bytes_sent';
- access_log /var/log/nginx/access.log main;
+ #access_log /var/log/nginx/access.log main;
+ access_log off;
# Mime settings
@@ -79,6 +80,20 @@ http {
error_page 502 503 504 /error/50x.html;
+ # Cache
+ proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=512m;
+ proxy_temp_path /var/cache/nginx/temp;
+ proxy_ignore_headers Expires Cache-Control;
+ proxy_cache_use_stale error timeout invalid_header http_502;
+ proxy_cache_valid any 3d;
+
+ map $http_cookie $no_cache {
+ default 0;
+ ~SESS 1;
+ ~wordpress_logged_in 1;
+ }
+
+
# Wildcard include
include /etc/nginx/conf.d/*.conf;
}
diff --git a/install/0.9.7/rhel/packages/default.pkg b/install/0.9.8/rhel/packages/default.pkg
similarity index 100%
rename from install/0.9.7/rhel/packages/default.pkg
rename to install/0.9.8/rhel/packages/default.pkg
diff --git a/install/0.9.7/rhel/packages/gainsboro.pkg b/install/0.9.8/rhel/packages/gainsboro.pkg
similarity index 100%
rename from install/0.9.7/rhel/packages/gainsboro.pkg
rename to install/0.9.8/rhel/packages/gainsboro.pkg
diff --git a/install/0.9.7/rhel/packages/palegreen.pkg b/install/0.9.8/rhel/packages/palegreen.pkg
similarity index 100%
rename from install/0.9.7/rhel/packages/palegreen.pkg
rename to install/0.9.8/rhel/packages/palegreen.pkg
diff --git a/install/0.9.7/rhel/packages/slategrey.pkg b/install/0.9.8/rhel/packages/slategrey.pkg
similarity index 100%
rename from install/0.9.7/rhel/packages/slategrey.pkg
rename to install/0.9.8/rhel/packages/slategrey.pkg
diff --git a/install/0.9.7/rhel/pg_hba.conf b/install/0.9.8/rhel/pg_hba.conf
similarity index 100%
rename from install/0.9.7/rhel/pg_hba.conf
rename to install/0.9.8/rhel/pg_hba.conf
diff --git a/install/0.9.7/rhel/pma.conf b/install/0.9.8/rhel/pma.conf
similarity index 100%
rename from install/0.9.7/rhel/pma.conf
rename to install/0.9.8/rhel/pma.conf
diff --git a/install/0.9.7/rhel/proftpd.conf b/install/0.9.8/rhel/proftpd.conf
similarity index 100%
rename from install/0.9.7/rhel/proftpd.conf
rename to install/0.9.8/rhel/proftpd.conf
diff --git a/install/0.9.7/rhel/roundcube-db.conf b/install/0.9.8/rhel/roundcube-db.conf
similarity index 100%
rename from install/0.9.7/rhel/roundcube-db.conf
rename to install/0.9.8/rhel/roundcube-db.conf
diff --git a/install/0.9.7/rhel/roundcube-driver.php b/install/0.9.8/rhel/roundcube-driver.php
similarity index 100%
rename from install/0.9.7/rhel/roundcube-driver.php
rename to install/0.9.8/rhel/roundcube-driver.php
diff --git a/install/0.9.7/rhel/roundcube-main.conf b/install/0.9.8/rhel/roundcube-main.conf
similarity index 100%
rename from install/0.9.7/rhel/roundcube-main.conf
rename to install/0.9.8/rhel/roundcube-main.conf
diff --git a/install/0.9.7/rhel/roundcube-pw.conf b/install/0.9.8/rhel/roundcube-pw.conf
similarity index 100%
rename from install/0.9.7/rhel/roundcube-pw.conf
rename to install/0.9.8/rhel/roundcube-pw.conf
diff --git a/install/0.9.7/rhel/spam-blocks.conf b/install/0.9.8/rhel/spam-blocks.conf
similarity index 100%
rename from install/0.9.7/rhel/spam-blocks.conf
rename to install/0.9.8/rhel/spam-blocks.conf
diff --git a/install/0.9.7/rhel/sudoers.conf b/install/0.9.8/rhel/sudoers.conf
similarity index 100%
rename from install/0.9.7/rhel/sudoers.conf
rename to install/0.9.8/rhel/sudoers.conf
diff --git a/install/0.9.8/rhel/templates/dns/default.tpl b/install/0.9.8/rhel/templates/dns/default.tpl
new file mode 100755
index 00000000..6d19ccca
--- /dev/null
+++ b/install/0.9.8/rhel/templates/dns/default.tpl
@@ -0,0 +1,9 @@
+ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='4' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='5' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='6' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='8' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='9' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%'
diff --git a/install/0.9.8/rhel/templates/dns/gmail.tpl b/install/0.9.8/rhel/templates/dns/gmail.tpl
new file mode 100755
index 00000000..950cfa45
--- /dev/null
+++ b/install/0.9.8/rhel/templates/dns/gmail.tpl
@@ -0,0 +1,14 @@
+ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='6' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='ghs.google.com.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='7' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='8' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='9' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='10' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='11' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ASPMX2.GOOGLEMAIL.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='13' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ASPMX3.GOOGLEMAIL.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%'
+ID='14' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ?all"' SUSPENDED='no' TIME='%time%' DATE='%date%'
diff --git a/install/0.9.7/rhel/templates/web/awstats/awstats.tpl b/install/0.9.8/rhel/templates/web/awstats/awstats.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/awstats/awstats.tpl
rename to install/0.9.8/rhel/templates/web/awstats/awstats.tpl
diff --git a/install/0.9.7/rhel/templates/web/awstats/index.tpl b/install/0.9.8/rhel/templates/web/awstats/index.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/awstats/index.tpl
rename to install/0.9.8/rhel/templates/web/awstats/index.tpl
diff --git a/install/0.9.7/rhel/templates/web/awstats/nav.tpl b/install/0.9.8/rhel/templates/web/awstats/nav.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/awstats/nav.tpl
rename to install/0.9.8/rhel/templates/web/awstats/nav.tpl
diff --git a/install/0.9.7/rhel/templates/web/apache/default.stpl b/install/0.9.8/rhel/templates/web/httpd/default.stpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/apache/default.stpl
rename to install/0.9.8/rhel/templates/web/httpd/default.stpl
diff --git a/install/0.9.7/rhel/templates/web/apache/default.tpl b/install/0.9.8/rhel/templates/web/httpd/default.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/apache/default.tpl
rename to install/0.9.8/rhel/templates/web/httpd/default.tpl
diff --git a/install/0.9.7/rhel/templates/web/apache/hosting.stpl b/install/0.9.8/rhel/templates/web/httpd/hosting.stpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/apache/hosting.stpl
rename to install/0.9.8/rhel/templates/web/httpd/hosting.stpl
diff --git a/install/0.9.7/rhel/templates/web/apache/hosting.tpl b/install/0.9.8/rhel/templates/web/httpd/hosting.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/apache/hosting.tpl
rename to install/0.9.8/rhel/templates/web/httpd/hosting.tpl
diff --git a/install/0.9.7/rhel/templates/web/apache/phpcgi.sh b/install/0.9.8/rhel/templates/web/httpd/phpcgi.sh
similarity index 100%
rename from install/0.9.7/rhel/templates/web/apache/phpcgi.sh
rename to install/0.9.8/rhel/templates/web/httpd/phpcgi.sh
diff --git a/install/0.9.7/rhel/templates/web/apache/phpcgi.stpl b/install/0.9.8/rhel/templates/web/httpd/phpcgi.stpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/apache/phpcgi.stpl
rename to install/0.9.8/rhel/templates/web/httpd/phpcgi.stpl
diff --git a/install/0.9.7/rhel/templates/web/apache/phpcgi.tpl b/install/0.9.8/rhel/templates/web/httpd/phpcgi.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/apache/phpcgi.tpl
rename to install/0.9.8/rhel/templates/web/httpd/phpcgi.tpl
diff --git a/install/0.9.8/rhel/templates/web/httpd/phpfcgid.sh b/install/0.9.8/rhel/templates/web/httpd/phpfcgid.sh
new file mode 100755
index 00000000..ccdf1a6a
--- /dev/null
+++ b/install/0.9.8/rhel/templates/web/httpd/phpfcgid.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Adding php wrapper
+user="$1"
+domain="$2"
+ip="$3"
+home_dir="$4"
+docroot="$5"
+
+wrapper_script="#!/bin/sh
+PHPRC=/usr/local/lib
+export PHPRC
+export PHP_FCGI_MAX_REQUESTS=1000
+export PHP_FCGI_CHILDREN=20
+exec /usr/local/bin/php
+"
+wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter"
+
+echo "$wrapper_script" > $wrapper_file
+chown $user:$user $wrapper_file
+chmod -f 751 $wrapper_file
+
+exit 0
diff --git a/install/0.9.8/rhel/templates/web/httpd/phpfcgid.stpl b/install/0.9.8/rhel/templates/web/httpd/phpfcgid.stpl
new file mode 100755
index 00000000..352d268b
--- /dev/null
+++ b/install/0.9.8/rhel/templates/web/httpd/phpfcgid.stpl
@@ -0,0 +1,36 @@
+
+
+ ServerName %domain_idn%
+ %alias_string%
+ ServerAdmin %email%
+ DocumentRoot %sdocroot%
+ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+ Alias /vstats/ %home%/%user%/web/%domain%/stats/
+ Alias /error/ %home%/%user%/web/%domain%/document_errors/
+ SuexecUserGroup %user% %group%
+ CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+ CustomLog /var/log/httpd/domains/%domain%.log combined
+ ErrorLog /var/log/httpd/domains/%domain%.error.log
+
+ SSLRequireSSL
+ AllowOverride All
+ Options +Includes -Indexes +ExecCGI
+
+ SetHandler fcgid-script
+
+ FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+
+
+ AllowOverride All
+
+ php_admin_value open_basedir none
+ SSLEngine on
+ SSLVerifyClient none
+ SSLCertificateFile %ssl_crt%
+ SSLCertificateKeyFile %ssl_key%
+ %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+
+ Include %home%/%user%/conf/web/shttpd.%domain%.conf*
+
+
+
diff --git a/install/0.9.8/rhel/templates/web/httpd/phpfcgid.tpl b/install/0.9.8/rhel/templates/web/httpd/phpfcgid.tpl
new file mode 100755
index 00000000..9826c946
--- /dev/null
+++ b/install/0.9.8/rhel/templates/web/httpd/phpfcgid.tpl
@@ -0,0 +1,28 @@
+
+
+ ServerName %domain_idn%
+ %alias_string%
+ ServerAdmin %email%
+ DocumentRoot %docroot%
+ ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+ Alias /vstats/ %home%/%user%/web/%domain%/stats/
+ Alias /error/ %home%/%user%/web/%domain%/document_errors/
+ SuexecUserGroup %user% %group%
+ CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+ CustomLog /var/log/httpd/domains/%domain%.log combined
+ ErrorLog /var/log/httpd/domains/%domain%.error.log
+
+ AllowOverride All
+ Options +Includes -Indexes +ExecCGI
+
+ SetHandler fcgid-script
+
+ FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+
+
+ AllowOverride All
+
+ Include %home%/%user%/conf/web/httpd.%domain%.conf*
+
+
+
diff --git a/install/0.9.8/rhel/templates/web/nginx/caching.stpl b/install/0.9.8/rhel/templates/web/nginx/caching.stpl
new file mode 100755
index 00000000..a916acb9
--- /dev/null
+++ b/install/0.9.8/rhel/templates/web/nginx/caching.stpl
@@ -0,0 +1,46 @@
+server {
+ listen %ip%:%proxy_ssl_port%;
+ server_name %domain_idn% %alias_idn%;
+ ssl on;
+ ssl_certificate %ssl_pem%;
+ ssl_certificate_key %ssl_key%;
+ error_log /var/log/httpd/domains/%domain%.error.log error;
+
+ location / {
+ proxy_pass http://%ip%:%web_port%;
+
+ proxy_cache cache;
+ proxy_cache_valid 10m;
+ proxy_cache_valid 404 1m;
+ proxy_no_cache $no_cache;
+ proxy_cache_bypass $no_cache;
+ proxy_cache_bypass $cookie_session $http_x_update;
+
+ location ~* ^.+\.(%proxy_extentions%)$ {
+ proxy_cache off;
+ root %docroot%;
+ access_log /var/log/httpd/domains/%domain%.log combined;
+ access_log /var/log/httpd/domains/%domain%.bytes bytes;
+ expires max;
+ try_files $uri @fallback;
+ }
+ }
+
+ location /error/ {
+ alias %home%/%user%/web/%domain%/document_errors/;
+ }
+
+ location @fallback {
+ proxy_pass http://%ip%:%web_port%;
+ }
+
+ location ~ /\.ht {return 404;}
+ location ~ /\.svn/ {return 404;}
+ location ~ /\.git/ {return 404;}
+ location ~ /\.hg/ {return 404;}
+ location ~ /\.bzr/ {return 404;}
+
+ disable_symlinks if_not_owner from=%home%/%user%;
+
+ include %home%/%user%/conf/nginx.%domain%.conf*;
+}
diff --git a/install/0.9.8/rhel/templates/web/nginx/caching.tpl b/install/0.9.8/rhel/templates/web/nginx/caching.tpl
new file mode 100755
index 00000000..d5bbb767
--- /dev/null
+++ b/install/0.9.8/rhel/templates/web/nginx/caching.tpl
@@ -0,0 +1,43 @@
+server {
+ listen %ip%:%proxy_port%;
+ server_name %domain_idn% %alias_idn%;
+ error_log /var/log/httpd/domains/%domain%.error.log error;
+
+ location / {
+ proxy_pass http://%ip%:%web_port%;
+
+ proxy_cache cache;
+ proxy_cache_valid 10m;
+ proxy_cache_valid 404 1m;
+ proxy_no_cache $no_cache;
+ proxy_cache_bypass $no_cache;
+ proxy_cache_bypass $cookie_session $http_x_update;
+
+ location ~* ^.+\.(%proxy_extentions%)$ {
+ proxy_cache off;
+ root %docroot%;
+ access_log /var/log/httpd/domains/%domain%.log combined;
+ access_log /var/log/httpd/domains/%domain%.bytes bytes;
+ expires max;
+ try_files $uri @fallback;
+ }
+ }
+
+ location /error/ {
+ alias %home%/%user%/web/%domain%/document_errors/;
+ }
+
+ location @fallback {
+ proxy_pass http://%ip%:%web_port%;
+ }
+
+ location ~ /\.ht {return 404;}
+ location ~ /\.svn/ {return 404;}
+ location ~ /\.git/ {return 404;}
+ location ~ /\.hg/ {return 404;}
+ location ~ /\.bzr/ {return 404;}
+
+ disable_symlinks if_not_owner from=%home%/%user%;
+
+ include %home%/%user%/conf/nginx.%domain%.conf*;
+}
diff --git a/install/0.9.7/rhel/templates/web/nginx/default.stpl b/install/0.9.8/rhel/templates/web/nginx/default.stpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/nginx/default.stpl
rename to install/0.9.8/rhel/templates/web/nginx/default.stpl
diff --git a/install/0.9.7/rhel/templates/web/nginx/default.tpl b/install/0.9.8/rhel/templates/web/nginx/default.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/nginx/default.tpl
rename to install/0.9.8/rhel/templates/web/nginx/default.tpl
diff --git a/install/0.9.7/rhel/templates/web/nginx/ip.tpl b/install/0.9.8/rhel/templates/web/nginx/proxy_ip.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/nginx/ip.tpl
rename to install/0.9.8/rhel/templates/web/nginx/proxy_ip.tpl
diff --git a/install/0.9.7/rhel/templates/web/skel/document_errors/403.html b/install/0.9.8/rhel/templates/web/skel/document_errors/403.html
similarity index 100%
rename from install/0.9.7/rhel/templates/web/skel/document_errors/403.html
rename to install/0.9.8/rhel/templates/web/skel/document_errors/403.html
diff --git a/install/0.9.7/rhel/templates/web/skel/document_errors/404.html b/install/0.9.8/rhel/templates/web/skel/document_errors/404.html
similarity index 100%
rename from install/0.9.7/rhel/templates/web/skel/document_errors/404.html
rename to install/0.9.8/rhel/templates/web/skel/document_errors/404.html
diff --git a/install/0.9.7/rhel/templates/web/skel/document_errors/50x.html b/install/0.9.8/rhel/templates/web/skel/document_errors/50x.html
similarity index 100%
rename from install/0.9.7/rhel/templates/web/skel/document_errors/50x.html
rename to install/0.9.8/rhel/templates/web/skel/document_errors/50x.html
diff --git a/install/0.9.7/rhel/templates/web/skel/public_html/index.html b/install/0.9.8/rhel/templates/web/skel/public_html/index.html
similarity index 100%
rename from install/0.9.7/rhel/templates/web/skel/public_html/index.html
rename to install/0.9.8/rhel/templates/web/skel/public_html/index.html
diff --git a/install/0.9.7/rhel/templates/web/skel/public_html/robots.txt b/install/0.9.8/rhel/templates/web/skel/public_html/robots.txt
similarity index 100%
rename from install/0.9.7/rhel/templates/web/skel/public_html/robots.txt
rename to install/0.9.8/rhel/templates/web/skel/public_html/robots.txt
diff --git a/install/0.9.7/rhel/templates/web/skel/public_shtml/index.html b/install/0.9.8/rhel/templates/web/skel/public_shtml/index.html
similarity index 100%
rename from install/0.9.7/rhel/templates/web/skel/public_shtml/index.html
rename to install/0.9.8/rhel/templates/web/skel/public_shtml/index.html
diff --git a/install/0.9.7/rhel/templates/web/skel/public_shtml/robots.txt b/install/0.9.8/rhel/templates/web/skel/public_shtml/robots.txt
similarity index 100%
rename from install/0.9.7/rhel/templates/web/skel/public_shtml/robots.txt
rename to install/0.9.8/rhel/templates/web/skel/public_shtml/robots.txt
diff --git a/install/0.9.7/rhel/templates/web/suspend/.htaccess b/install/0.9.8/rhel/templates/web/suspend/.htaccess
similarity index 100%
rename from install/0.9.7/rhel/templates/web/suspend/.htaccess
rename to install/0.9.8/rhel/templates/web/suspend/.htaccess
diff --git a/install/0.9.7/rhel/templates/web/suspend/index.html b/install/0.9.8/rhel/templates/web/suspend/index.html
similarity index 100%
rename from install/0.9.7/rhel/templates/web/suspend/index.html
rename to install/0.9.8/rhel/templates/web/suspend/index.html
diff --git a/install/0.9.7/rhel/templates/web/webalizer/webalizer.tpl b/install/0.9.8/rhel/templates/web/webalizer/webalizer.tpl
similarity index 100%
rename from install/0.9.7/rhel/templates/web/webalizer/webalizer.tpl
rename to install/0.9.8/rhel/templates/web/webalizer/webalizer.tpl
diff --git a/install/0.9.7/rhel/vesta.log b/install/0.9.8/rhel/vesta.log
similarity index 100%
rename from install/0.9.7/rhel/vesta.log
rename to install/0.9.8/rhel/vesta.log
diff --git a/install/0.9.7/rhel/vsftpd.conf b/install/0.9.8/rhel/vsftpd.conf
similarity index 100%
rename from install/0.9.7/rhel/vsftpd.conf
rename to install/0.9.8/rhel/vsftpd.conf
diff --git a/install/0.9.7/rhel/whmcs-module.php b/install/0.9.8/rhel/whmcs-module.php
similarity index 100%
rename from install/0.9.7/rhel/whmcs-module.php
rename to install/0.9.8/rhel/whmcs-module.php