Skip to content

Commit f709eba

Browse files
serghey-rodinserghey-rodin
committed
new template structure
1 parent cd69b7b commit f709eba

File tree

18 files changed

+16
-127
lines changed

18 files changed

+16
-127
lines changed

install/0.9.7/rhel/templates/web/apache_default.stpl renamed to install/0.9.7/rhel/templates/web/apache/default.stpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
%alias_string%
55
ServerAdmin %email%
66
DocumentRoot %sdocroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
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-
ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %sdocroot%>
1515
AllowOverride All
1616
SSLRequireSSL
17-
Options +Includes -Indexes +ExecCGI
17+
Options +Includes -Indexes %cgi_option%
1818
</Directory>
1919
<Directory %home%/%user%/web/%domain%/stats>
2020
AllowOverride All

install/0.9.7/rhel/templates/web/apache_default.tpl renamed to install/0.9.7/rhel/templates/web/apache/default.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
%alias_string%
55
ServerAdmin %email%
66
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
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-
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
</Directory>
1818
<Directory %home%/%user%/web/%domain%/stats>
1919
AllowOverride All

install/0.9.7/rhel/templates/web/apache_hosting.stpl renamed to install/0.9.7/rhel/templates/web/apache/hosting.stpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
%alias_string%
55
ServerAdmin %email%
66
DocumentRoot %sdocroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
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-
ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %sdocroot%>
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

install/0.9.7/rhel/templates/web/apache_hosting.tpl renamed to install/0.9.7/rhel/templates/web/apache/hosting.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
%alias_string%
55
ServerAdmin %email%
66
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
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-
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

install/0.9.7/rhel/templates/web/apache_phpcgi.sh renamed to install/0.9.7/rhel/templates/web/apache/phpcgi.sh

File renamed without changes.

install/0.9.7/rhel/templates/web/apache_phpcgi.stpl renamed to install/0.9.7/rhel/templates/web/apache/phpcgi.stpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
%alias_string%
55
ServerAdmin %email%
66
DocumentRoot %sdocroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
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-
ErrorLog /var/log/httpd/domains/%domain%.error.log
13+
%elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
1414
<Directory %sdocroot%>
1515
SSLRequireSSL
1616
AllowOverride All

install/0.9.7/rhel/templates/web/apache_phpcgi.tpl renamed to install/0.9.7/rhel/templates/web/apache/phpcgi.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
%alias_string%
55
ServerAdmin %email%
66
DocumentRoot %docroot%
7-
ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
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-
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
Options +Includes -Indexes +ExecCGI

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)