new template structure

install/0.9.7/rhel/templates/web/apache/default.stpl

@@ -4,17 +4,17 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %sdocroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %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
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %sdocroot%>
         AllowOverride All
         SSLRequireSSL
-        Options +Includes -Indexes +ExecCGI
+        Options +Includes -Indexes %cgi_option%
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/0.9.7/rhel/templates/web/apache/default.tpl

@@ -4,16 +4,16 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %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
-    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%
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All

install/0.9.7/rhel/templates/web/apache/hosting.stpl

@@ -4,17 +4,17 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %sdocroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %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
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %sdocroot%>
         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

install/0.9.7/rhel/templates/web/apache/hosting.tpl

@@ -4,16 +4,16 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %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
-    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

install/0.9.7/rhel/templates/web/apache/phpcgi.stpl

@@ -4,13 +4,13 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %sdocroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %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
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %sdocroot%>
         SSLRequireSSL
         AllowOverride All

install/0.9.7/rhel/templates/web/apache/phpcgi.tpl

@@ -4,13 +4,13 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    %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
-    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

install/0.9.7/rhel/templates/web/apache_phpfcgid.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# Adding php wrapper
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-wrapper_script="#!/bin/sh
-PHPRC=/etc/
-export PHPRC
-export PHP_FCGI_MAX_REQUESTS=1000
-export PHP_FCGI_CHILDREN=8
-exec /usr/bin/php-cgi
-"
-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

install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl

@@ -1,36 +0,0 @@
-<VirtualHost %ip%:%web_ssl_port%>
-
-    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
-    <Directory %sdocroot%>
-        SSLRequireSSL
-        AllowOverride All
-        Options +Includes -Indexes +ExecCGI
-        <Files *.php>
-          SetHandler fcgid-script
-        </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
-    </Directory>
-    <Directory %home%/%user%/web/%domain%/stats>
-        AllowOverride All
-    </Directory>
-    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*
-
-</VirtualHost>
-

install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl

@@ -1,28 +0,0 @@
-<VirtualHost %ip%:%web_port%>
-
-    ServerName %domain_idn%
-    %alias_string%
-    ServerAdmin %email%
-    DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
-    Alias /vstats/ %home%/%user%/web/%domain%/stats/
-    Alias /error/ %home%/%user%/web/%domain%/document_errors/
-    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
-    <Directory %docroot%>
-        AllowOverride All
-        Options +Includes -Indexes +ExecCGI
-        <Files *.php>
-          SetHandler fcgid-script
-        </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
-    </Directory>
-    <Directory %home%/%user%/web/%domain%/stats>
-        AllowOverride All
-    </Directory>
-    Include %home%/%user%/conf/web/httpd.%domain%.conf*
-
-</VirtualHost>
-

install/0.9.7/rhel/templates/web/email_reset_password.tpl

@@ -1,25 +0,0 @@
-<div lang="en" style="background-color:#fff;color:#222">  
-<a target="_blank" href="" style="color:#FFF">
-    <img width="81" height="22" style="display:block;border:0" src="http://vestacp.com/i/logo.png" alt="Twitter">
-</a>  
-<div style="font-family:'Helvetica Neue', Arial, Helvetica, sans-serif;font-size:13px;margin:14px">
-<h2 style="font-family:'Helvetica Neue', Arial, Helvetica, sans-serif;margin:0 0 16px;font-size:18px;font-weight:normal">
-    Vesta received a request to reset the password for your account %FIRSTNAME% %LASTNAME% (%LOGIN%)?
-</h2>
-<p>
-    If you want to reset your password, click on the link below (or copy and paste the URL into your browser):<br>
-    <a target="_blank" href="%LINK%"></a>
-</p>
-<p>
-    If you don't want to reset your password, please ignore this message.
-    Your password will not be reset.
-    If you have any concerns, please contact us at support@vestacp.com.
-</p>
-<p style="font-family:'Helvetica Neue', Arial, Helvetica, sans-serif;font-size:13px;line-height:18px;border-bottom:1px solid rgb(238, 238, 238);padding-bottom:10px;margin:0 0 10px">
-    <span style="font:italic 13px Georgia,serif;color:rgb(102, 102, 102)">VestaCP</span>
-</p>
-<p style="font-family:'Helvetica Neue', Arial, Helvetica, sans-serif;margin-top:5px;font-size:10px;color:#888888">
-    Please do not reply to this message; it was sent from an unmonitored email address.      
-</p>
-</div>
-</div>