From f709eba084b7abd2da75d90d621c312c7e46582f Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Apr 2013 23:27:18 +0300 Subject: [PATCH] new template structure --- .../default.stpl} | 6 ++-- .../default.tpl} | 6 ++-- .../hosting.stpl} | 6 ++-- .../hosting.tpl} | 6 ++-- .../{apache_phpcgi.sh => apache/phpcgi.sh} | 0 .../phpcgi.stpl} | 4 +-- .../{apache_phpcgi.tpl => apache/phpcgi.tpl} | 4 +-- .../rhel/templates/web/apache_phpfcgid.sh | 22 ------------ .../rhel/templates/web/apache_phpfcgid.stpl | 36 ------------------- .../rhel/templates/web/apache_phpfcgid.tpl | 28 --------------- .../templates/web/{ => awstats}/awstats.tpl | 0 .../{awstats_index.tpl => awstats/index.tpl} | 0 .../web/{awstats_nav.tpl => awstats/nav.tpl} | 0 .../templates/web/email_reset_password.tpl | 25 ------------- .../default.stpl} | 0 .../{nginx_default.tpl => nginx/default.tpl} | 0 .../web/{ngingx.ip.tpl => nginx/ip.tpl} | 0 .../web/{ => webalizer}/webalizer.tpl | 0 18 files changed, 16 insertions(+), 127 deletions(-) rename install/0.9.7/rhel/templates/web/{apache_default.stpl => apache/default.stpl} (85%) rename install/0.9.7/rhel/templates/web/{apache_default.tpl => apache/default.tpl} (82%) rename install/0.9.7/rhel/templates/web/{apache_hosting.stpl => apache/hosting.stpl} (90%) rename install/0.9.7/rhel/templates/web/{apache_hosting.tpl => apache/hosting.tpl} (89%) rename install/0.9.7/rhel/templates/web/{apache_phpcgi.sh => apache/phpcgi.sh} (100%) rename install/0.9.7/rhel/templates/web/{apache_phpcgi.stpl => apache/phpcgi.stpl} (88%) rename install/0.9.7/rhel/templates/web/{apache_phpcgi.tpl => apache/phpcgi.tpl} (86%) delete mode 100755 install/0.9.7/rhel/templates/web/apache_phpfcgid.sh delete mode 100755 install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl delete mode 100755 install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl rename install/0.9.7/rhel/templates/web/{ => awstats}/awstats.tpl (100%) rename install/0.9.7/rhel/templates/web/{awstats_index.tpl => awstats/index.tpl} (100%) rename install/0.9.7/rhel/templates/web/{awstats_nav.tpl => awstats/nav.tpl} (100%) delete mode 100755 install/0.9.7/rhel/templates/web/email_reset_password.tpl rename install/0.9.7/rhel/templates/web/{nginx_default.stpl => nginx/default.stpl} (100%) rename install/0.9.7/rhel/templates/web/{nginx_default.tpl => nginx/default.tpl} (100%) rename install/0.9.7/rhel/templates/web/{ngingx.ip.tpl => nginx/ip.tpl} (100%) rename install/0.9.7/rhel/templates/web/{ => webalizer}/webalizer.tpl (100%) diff --git a/install/0.9.7/rhel/templates/web/apache_default.stpl b/install/0.9.7/rhel/templates/web/apache/default.stpl similarity index 85% rename from install/0.9.7/rhel/templates/web/apache_default.stpl rename to install/0.9.7/rhel/templates/web/apache/default.stpl index fad3be95..71c0fe8a 100755 --- a/install/0.9.7/rhel/templates/web/apache_default.stpl +++ b/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 AllowOverride All SSLRequireSSL - Options +Includes -Indexes +ExecCGI + Options +Includes -Indexes %cgi_option% AllowOverride All diff --git a/install/0.9.7/rhel/templates/web/apache_default.tpl b/install/0.9.7/rhel/templates/web/apache/default.tpl similarity index 82% rename from install/0.9.7/rhel/templates/web/apache_default.tpl rename to install/0.9.7/rhel/templates/web/apache/default.tpl index a17b85dc..3d3fb016 100755 --- a/install/0.9.7/rhel/templates/web/apache_default.tpl +++ b/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 AllowOverride All - Options +Includes -Indexes +ExecCGI + Options +Includes -Indexes %cgi_option% AllowOverride All diff --git a/install/0.9.7/rhel/templates/web/apache_hosting.stpl b/install/0.9.7/rhel/templates/web/apache/hosting.stpl similarity index 90% rename from install/0.9.7/rhel/templates/web/apache_hosting.stpl rename to install/0.9.7/rhel/templates/web/apache/hosting.stpl index 3693c1f6..807ee438 100755 --- a/install/0.9.7/rhel/templates/web/apache_hosting.stpl +++ b/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 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 diff --git a/install/0.9.7/rhel/templates/web/apache_hosting.tpl b/install/0.9.7/rhel/templates/web/apache/hosting.tpl similarity index 89% rename from install/0.9.7/rhel/templates/web/apache_hosting.tpl rename to install/0.9.7/rhel/templates/web/apache/hosting.tpl index a4b34af8..1d29eef7 100755 --- a/install/0.9.7/rhel/templates/web/apache_hosting.tpl +++ b/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 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 diff --git a/install/0.9.7/rhel/templates/web/apache_phpcgi.sh b/install/0.9.7/rhel/templates/web/apache/phpcgi.sh similarity index 100% rename from install/0.9.7/rhel/templates/web/apache_phpcgi.sh rename to install/0.9.7/rhel/templates/web/apache/phpcgi.sh diff --git a/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl b/install/0.9.7/rhel/templates/web/apache/phpcgi.stpl similarity index 88% rename from install/0.9.7/rhel/templates/web/apache_phpcgi.stpl rename to install/0.9.7/rhel/templates/web/apache/phpcgi.stpl index b3e6488a..b56dbc37 100755 --- a/install/0.9.7/rhel/templates/web/apache_phpcgi.stpl +++ b/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 SSLRequireSSL AllowOverride All diff --git a/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl b/install/0.9.7/rhel/templates/web/apache/phpcgi.tpl similarity index 86% rename from install/0.9.7/rhel/templates/web/apache_phpcgi.tpl rename to install/0.9.7/rhel/templates/web/apache/phpcgi.tpl index 952d2b49..4fd56c33 100755 --- a/install/0.9.7/rhel/templates/web/apache_phpcgi.tpl +++ b/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 AllowOverride All Options +Includes -Indexes +ExecCGI diff --git a/install/0.9.7/rhel/templates/web/apache_phpfcgid.sh b/install/0.9.7/rhel/templates/web/apache_phpfcgid.sh deleted file mode 100755 index d044d3f1..00000000 --- a/install/0.9.7/rhel/templates/web/apache_phpfcgid.sh +++ /dev/null @@ -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 diff --git a/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl b/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl deleted file mode 100755 index 352d268b..00000000 --- a/install/0.9.7/rhel/templates/web/apache_phpfcgid.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - 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.7/rhel/templates/web/apache_phpfcgid.tpl b/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl deleted file mode 100755 index 9826c946..00000000 --- a/install/0.9.7/rhel/templates/web/apache_phpfcgid.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - - 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.7/rhel/templates/web/awstats.tpl b/install/0.9.7/rhel/templates/web/awstats/awstats.tpl similarity index 100% rename from install/0.9.7/rhel/templates/web/awstats.tpl rename to install/0.9.7/rhel/templates/web/awstats/awstats.tpl diff --git a/install/0.9.7/rhel/templates/web/awstats_index.tpl b/install/0.9.7/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.7/rhel/templates/web/awstats/index.tpl diff --git a/install/0.9.7/rhel/templates/web/awstats_nav.tpl b/install/0.9.7/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.7/rhel/templates/web/awstats/nav.tpl diff --git a/install/0.9.7/rhel/templates/web/email_reset_password.tpl b/install/0.9.7/rhel/templates/web/email_reset_password.tpl deleted file mode 100755 index 0e1161fa..00000000 --- a/install/0.9.7/rhel/templates/web/email_reset_password.tpl +++ /dev/null @@ -1,25 +0,0 @@ -
- - Twitter - -
-

- Vesta received a request to reset the password for your account %FIRSTNAME% %LASTNAME% (%LOGIN%)? -

-

- If you want to reset your password, click on the link below (or copy and paste the URL into your browser):
- -

-

- 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. -

-

- VestaCP -

-

- Please do not reply to this message; it was sent from an unmonitored email address. -

-
-
diff --git a/install/0.9.7/rhel/templates/web/nginx_default.stpl b/install/0.9.7/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.7/rhel/templates/web/nginx/default.stpl diff --git a/install/0.9.7/rhel/templates/web/nginx_default.tpl b/install/0.9.7/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.7/rhel/templates/web/nginx/default.tpl diff --git a/install/0.9.7/rhel/templates/web/ngingx.ip.tpl b/install/0.9.7/rhel/templates/web/nginx/ip.tpl similarity index 100% rename from install/0.9.7/rhel/templates/web/ngingx.ip.tpl rename to install/0.9.7/rhel/templates/web/nginx/ip.tpl diff --git a/install/0.9.7/rhel/templates/web/webalizer.tpl b/install/0.9.7/rhel/templates/web/webalizer/webalizer.tpl similarity index 100% rename from install/0.9.7/rhel/templates/web/webalizer.tpl rename to install/0.9.7/rhel/templates/web/webalizer/webalizer.tpl