8k alias issue fix, plus cgi and suspend string

data/templates/apache_default.stpl

@@ -1,20 +1,20 @@
 <VirtualHost %ip%:%web_ssl_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
         SSLRequireSSL
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
         php_admin_value upload_tmp_dir %home%/%user%/tmp
         php_admin_value upload_max_filesize 10M
         php_admin_value max_execution_time 20

data/templates/apache_default.tpl

@@ -1,19 +1,19 @@
 <VirtualHost %ip%:%web_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
         php_admin_value upload_tmp_dir %home%/%user%/tmp
         php_admin_value upload_max_filesize 10M
         php_admin_value max_execution_time 20

data/templates/apache_phpcgi.stpl

@@ -1,20 +1,20 @@
 <VirtualHost %ip%:%web_ssl_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
         SSLRequireSSL
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
         php_admin_flag engine off
         Action phpcgi-script /cgi-bin/php
         AddHandler phpcgi-script .php

data/templates/apache_phpcgi.tpl

@@ -1,25 +1,22 @@
 <VirtualHost %ip%:%web_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
-        Options +Includes -Indexes +ExecCGI
-
+        Options +Includes -Indexes %cgi_option%
         php_admin_flag engine off
-
         Action phpcgi-script /cgi-bin/php
         AddHandler phpcgi-script .php
-
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

data/templates/apache_phpfcgid.stpl

@@ -1,20 +1,20 @@
 <VirtualHost %ip%:%web_ssl_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
         SSLRequireSSL
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
         php_admin_flag engine off
         AddHandler fcgid-script .php
         FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php

data/templates/apache_phpfcgid.tpl

@@ -1,19 +1,19 @@
 <VirtualHost %ip%:%web_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
         php_admin_flag engine off
         AddHandler fcgid-script .php
         FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php

data/templates/apache_unlim.stpl

@@ -1,20 +1,20 @@
 <VirtualHost %ip%:%web_ssl_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride All
         SSLRequireSSL
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
         php_admin_value upload_tmp_dir %home%/%user%/tmp
         php_admin_value upload_max_filesize 60M
         php_admin_value max_execution_time 60

data/templates/apache_unlim.tpl

@@ -1,19 +1,19 @@
 <VirtualHost %ip%:%web_port%>
 
     ServerName %domain_idn%
-    ServerAlias %alias_idn%
+    %alias_string%
     ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %docroot_string%
+    %cgi%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
-   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride All
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
         php_admin_value upload_tmp_dir %home%/%user%/tmp
         php_admin_value upload_max_filesize 60M
         php_admin_value max_execution_time 60

data/templates/ngingx_vhost_default.stpl

@@ -5,12 +5,11 @@ server {
     ssl         on;
     ssl_certificate      %ssl_cert%;
     ssl_certificate_key  %ssl_key%;
-   %elog%error_log  /var/log/httpd/domains/%domain%.error.log error;
+    %elog%error_log  /var/log/httpd/domains/%domain%.error.log error;
 
     location / {
-        proxy_pass     https://%ip%:%web_ssl_port%;
-
-        location ~* ^.+\.(%extentions%)$ {
+        %proxy_string%
+        location ~* ^.+\.(%nginx_extentions%)$ {
             root           %docroot%;
             access_log     /var/log/httpd/domains/%domain%.log combined;
             access_log     /var/log/httpd/domains/%domain%.bytes bytes;

data/templates/ngingx_vhost_default.tpl

@@ -2,12 +2,11 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     server_name_in_redirect off;
-   %elog%error_log  /var/log/httpd/domains/%domain%.error.log error;
+    %elog%error_log  /var/log/httpd/domains/%domain%.error.log error;
 
     location / {
-        proxy_pass     http://%ip%:%web_port%;
-
-        location ~* ^.+\.(%extentions%)$ {
+        %proxy_string%
+        location ~* ^.+\.(%nginx_extentions%)$ {
             root           %docroot%;
             access_log     /var/log/httpd/domains/%domain%.log combined;
             access_log     /var/log/httpd/domains/%domain%.bytes bytes;