Skip to content

Commit 9ca747f

Browse files
serghey-rodinserghey-rodin
committed
8k alias issue fix, plus cgi and suspend string
1 parent acaa096 commit 9ca747f

File tree

10 files changed

+46
-51
lines changed

10 files changed

+46
-51
lines changed

‎data/templates/apache_default.stpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<VirtualHost %ip%:%web_ssl_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride AuthConfig FileInfo Indexes Limit
1616
SSLRequireSSL
17-
Options +Includes -Indexes +ExecCGI
17+
Options +Includes -Indexes %cgi_option%
1818
php_admin_value upload_tmp_dir %home%/%user%/tmp
1919
php_admin_value upload_max_filesize 10M
2020
php_admin_value max_execution_time 20

‎data/templates/apache_default.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<VirtualHost %ip%:%web_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride AuthConfig FileInfo Indexes Limit
16-
Options +Includes -Indexes +ExecCGI
16+
Options +Includes -Indexes %cgi_option%
1717
php_admin_value upload_tmp_dir %home%/%user%/tmp
1818
php_admin_value upload_max_filesize 10M
1919
php_admin_value max_execution_time 20

‎data/templates/apache_phpcgi.stpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<VirtualHost %ip%:%web_ssl_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride AuthConfig FileInfo Indexes Limit
1616
SSLRequireSSL
17-
Options +Includes -Indexes +ExecCGI
17+
Options +Includes -Indexes %cgi_option%
1818
php_admin_flag engine off
1919
Action phpcgi-script /cgi-bin/php
2020
AddHandler phpcgi-script .php

‎data/templates/apache_phpcgi.tpl‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
<VirtualHost %ip%:%web_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride AuthConfig FileInfo Indexes Limit
16-
Options +Includes -Indexes +ExecCGI
17-
16+
Options +Includes -Indexes %cgi_option%
1817
php_admin_flag engine off
19-
2018
Action phpcgi-script /cgi-bin/php
2119
AddHandler phpcgi-script .php
22-
2320
</Directory>
2421
<Directory %home%/%user%/web/%domain%/stats>
2522
AllowOverride All

‎data/templates/apache_phpfcgid.stpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<VirtualHost %ip%:%web_ssl_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride AuthConfig FileInfo Indexes Limit
1616
SSLRequireSSL
17-
Options +Includes -Indexes +ExecCGI
17+
Options +Includes -Indexes %cgi_option%
1818
php_admin_flag engine off
1919
AddHandler fcgid-script .php
2020
FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php

‎data/templates/apache_phpfcgid.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<VirtualHost %ip%:%web_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride AuthConfig FileInfo Indexes Limit
16-
Options +Includes -Indexes +ExecCGI
16+
Options +Includes -Indexes %cgi_option%
1717
php_admin_flag engine off
1818
AddHandler fcgid-script .php
1919
FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php

‎data/templates/apache_unlim.stpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<VirtualHost %ip%:%web_ssl_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride All
1616
SSLRequireSSL
17-
Options +Includes -Indexes +ExecCGI
17+
Options +Includes -Indexes %cgi_option%
1818
php_admin_value upload_tmp_dir %home%/%user%/tmp
1919
php_admin_value upload_max_filesize 60M
2020
php_admin_value max_execution_time 60

‎data/templates/apache_unlim.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<VirtualHost %ip%:%web_port%>
22

33
ServerName %domain_idn%
4-
ServerAlias %alias_idn%
4+
%alias_string%
55
ServerAdmin %email%
6-
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
6+
%docroot_string%
7+
%cgi%ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
1111
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
1212
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride All
16-
Options +Includes -Indexes +ExecCGI
16+
Options +Includes -Indexes %cgi_option%
1717
php_admin_value upload_tmp_dir %home%/%user%/tmp
1818
php_admin_value upload_max_filesize 60M
1919
php_admin_value max_execution_time 60

‎data/templates/ngingx_vhost_default.stpl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ server {
55
ssl on;
66
ssl_certificate %ssl_cert%;
77
ssl_certificate_key %ssl_key%;
8-
%elog%error_log /var/log/httpd/domains/%domain%.error.log error;
8+
%elog%error_log /var/log/httpd/domains/%domain%.error.log error;
99

1010
location / {
11-
proxy_pass https://%ip%:%web_ssl_port%;
12-
13-
location ~* ^.+\.(%extentions%)$ {
11+
%proxy_string%
12+
location ~* ^.+\.(%nginx_extentions%)$ {
1413
root %docroot%;
1514
access_log /var/log/httpd/domains/%domain%.log combined;
1615
access_log /var/log/httpd/domains/%domain%.bytes bytes;

‎data/templates/ngingx_vhost_default.tpl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ server {
22
listen %ip%:%proxy_port%;
33
server_name %domain_idn% %alias_idn%;
44
server_name_in_redirect off;
5-
%elog%error_log /var/log/httpd/domains/%domain%.error.log error;
5+
%elog%error_log /var/log/httpd/domains/%domain%.error.log error;
66
77
location / {
8-
proxy_pass http://%ip%:%web_port%;
9-
10-
location ~* ^.+\.(%extentions%)$ {
8+
%proxy_string%
9+
location ~* ^.+\.(%nginx_extentions%)$ {
1110
root %docroot%;
1211
access_log /var/log/httpd/domains/%domain%.log combined;
1312
access_log /var/log/httpd/domains/%domain%.bytes bytes;

0 commit comments

Comments
 (0)