github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 04:50:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

8k alias issue fix, plus cgi and suspend string

Browse source
This commit is contained in:
Serghey Rodin 2011-11-21 15:35:54 +02:00
commit 9ca747f89e
10 changed files with 46 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/templates/apache_default.stpl
View file

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

10
data/templates/apache_default.tpl
View file

@ -1,19 +1,19 @@
<VirtualHost %ip%:%web_port%> <VirtualHost %ip%:%web_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% %alias_string%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% %docroot_string%
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 /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/web/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined 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%> <Directory %docroot%>
AllowOverride AuthConfig FileInfo Indexes Limit 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_tmp_dir %home%/%user%/tmp
php_admin_value upload_max_filesize 10M php_admin_value upload_max_filesize 10M
php_admin_value max_execution_time 20 php_admin_value max_execution_time 20

10
data/templates/apache_phpcgi.stpl
View file

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

13
data/templates/apache_phpcgi.tpl
View file

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

10
data/templates/apache_phpfcgid.stpl
View file

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

10
data/templates/apache_phpfcgid.tpl
View file

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

10
data/templates/apache_unlim.stpl
View file

@ -1,20 +1,20 @@
<VirtualHost %ip%:%web_ssl_port%> <VirtualHost %ip%:%web_ssl_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% %alias_string%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% %docroot_string%
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 /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/web/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined 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%> <Directory %docroot%>
AllowOverride All AllowOverride All
SSLRequireSSL SSLRequireSSL
Options +Includes -Indexes +ExecCGI Options +Includes -Indexes %cgi_option%
php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp
php_admin_value upload_max_filesize 60M php_admin_value upload_max_filesize 60M
php_admin_value max_execution_time 60 php_admin_value max_execution_time 60

10
data/templates/apache_unlim.tpl
View file

@ -1,19 +1,19 @@
<VirtualHost %ip%:%web_port%> <VirtualHost %ip%:%web_port%>
ServerName %domain_idn% ServerName %domain_idn%
ServerAlias %alias_idn% %alias_string%
ServerAdmin %email% ServerAdmin %email%
DocumentRoot %docroot% %docroot_string%
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 /vstats/ %home%/%user%/web/%domain%/stats/
Alias /error/ %home%/%user%/web/%domain%/document_errors/ Alias /error/ %home%/%user%/web/%domain%/document_errors/
SuexecUserGroup %user% %group% SuexecUserGroup %user% %group%
CustomLog /var/log/httpd/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined 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%> <Directory %docroot%>
AllowOverride All AllowOverride All
Options +Includes -Indexes +ExecCGI Options +Includes -Indexes %cgi_option%
php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp
php_admin_value upload_max_filesize 60M php_admin_value upload_max_filesize 60M
php_admin_value max_execution_time 60 php_admin_value max_execution_time 60

7
data/templates/ngingx_vhost_default.stpl
View file

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

7
data/templates/ngingx_vhost_default.tpl
View file

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