Skip to content

Commit 47ba7d7

Browse files
serghey-rodinserghey-rodin
committed
Adding RGROUPS var to make templates platform independent
1 parent a279421 commit 47ba7d7

File tree

18 files changed

+75
-52
lines changed

18 files changed

+75
-52
lines changed

‎install/rhel/templates/web/httpd/basedir.stpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
#SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %sdocroot%>
1515
AllowOverride All
1616
SSLRequireSSL
@@ -29,13 +29,13 @@
2929
<IfModule mod_ruid2.c>
3030
RMode config
3131
RUidGid %user% %group%
32-
RGroups apache
32+
RGroups %rgroups%
3333
</IfModule>
3434
<IfModule itk.c>
3535
AssignUserID %user% %group%
3636
</IfModule>
3737

38-
Include %home%/%user%/conf/web/shttpd.%domain%.conf*
38+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
3939

4040
</VirtualHost>
4141

‎install/rhel/templates/web/httpd/basedir.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
#SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
@@ -23,13 +23,13 @@
2323
<IfModule mod_ruid2.c>
2424
RMode config
2525
RUidGid %user% %group%
26-
RGroups apache
26+
RGroups %rgroups%
2727
</IfModule>
2828
<IfModule itk.c>
2929
AssignUserID %user% %group%
3030
</IfModule>
3131

32-
Include %home%/%user%/conf/web/httpd.%domain%.conf*
32+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
3333

3434
</VirtualHost>
3535

‎install/rhel/templates/web/httpd/default.stpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
#SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %sdocroot%>
1515
AllowOverride All
1616
SSLRequireSSL
@@ -28,13 +28,13 @@
2828
<IfModule mod_ruid2.c>
2929
RMode config
3030
RUidGid %user% %group%
31-
RGroups apache
31+
RGroups %rgroups%
3232
</IfModule>
3333
<IfModule itk.c>
3434
AssignUserID %user% %group%
3535
</IfModule>
3636

37-
Include %home%/%user%/conf/web/shttpd.%domain%.conf*
37+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
3838

3939
</VirtualHost>
4040

‎install/rhel/templates/web/httpd/default.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
#SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
@@ -22,13 +22,13 @@
2222
<IfModule mod_ruid2.c>
2323
RMode config
2424
RUidGid %user% %group%
25-
RGroups apache
25+
RGroups %rgroups%
2626
</IfModule>
2727
<IfModule itk.c>
2828
AssignUserID %user% %group%
2929
</IfModule>
3030

31-
Include %home%/%user%/conf/web/httpd.%domain%.conf*
31+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
3232

3333
</VirtualHost>
3434

‎install/rhel/templates/web/httpd/hosting.stpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
#SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %sdocroot%>
1515
AllowOverride All
1616
SSLRequireSSL
@@ -37,13 +37,13 @@
3737
<IfModule mod_ruid2.c>
3838
RMode config
3939
RUidGid %user% %group%
40-
RGroups apache
40+
RGroups %rgroups%
4141
</IfModule>
4242
<IfModule itk.c>
4343
AssignUserID %user% %group%
4444
</IfModule>
4545

46-
Include %home%/%user%/conf/web/shttpd.%domain%.conf*
46+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
4747

4848
</VirtualHost>
4949

‎install/rhel/templates/web/httpd/hosting.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
#SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
@@ -31,13 +31,13 @@
3131
<IfModule mod_ruid2.c>
3232
RMode config
3333
RUidGid %user% %group%
34-
RGroups apache
34+
RGroups %rgroups%
3535
</IfModule>
3636
<IfModule itk.c>
3737
AssignUserID %user% %group%
3838
</IfModule>
3939

40-
Include %home%/%user%/conf/web/httpd.%domain%.conf*
40+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
4141

4242
</VirtualHost>
4343

‎install/rhel/templates/web/httpd/phpcgi.stpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %sdocroot%>
1515
SSLRequireSSL
1616
AllowOverride All
@@ -29,7 +29,7 @@
2929
SSLCertificateKeyFile %ssl_key%
3030
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
3131

32-
Include %home%/%user%/conf/web/shttpd.%domain%.conf*
32+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
3333

3434
</VirtualHost>
3535

‎install/rhel/templates/web/httpd/phpcgi.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
@@ -22,7 +22,7 @@
2222
<Directory %home%/%user%/web/%domain%/stats>
2323
AllowOverride All
2424
</Directory>
25-
Include %home%/%user%/conf/web/httpd.%domain%.conf*
25+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
2626

2727
</VirtualHost>
2828

‎install/rhel/templates/web/httpd/phpfcgid.stpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %sdocroot%>
1515
SSLRequireSSL
1616
AllowOverride All
@@ -30,7 +30,7 @@
3030
SSLCertificateKeyFile %ssl_key%
3131
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
3232

33-
Include %home%/%user%/conf/web/shttpd.%domain%.conf*
33+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
3434

3535
</VirtualHost>
3636

‎install/rhel/templates/web/httpd/phpfcgid.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Alias /vstats/ %home%/%user%/web/%domain%/stats/
99
Alias /error/ %home%/%user%/web/%domain%/document_errors/
1010
SuexecUserGroup %user% %group%
11-
CustomLog /var/log/httpd/domains/%domain%.bytes bytes
12-
CustomLog /var/log/httpd/domains/%domain%.log combined
13-
ErrorLog /var/log/httpd/domains/%domain%.error.log
11+
CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
12+
CustomLog /var/log/%web_system%/domains/%domain%.log combined
13+
ErrorLog /var/log/%web_system%/domains/%domain%.error.log
1414
<Directory %docroot%>
1515
AllowOverride All
1616
Options +Includes -Indexes +ExecCGI
@@ -22,7 +22,7 @@
2222
<Directory %home%/%user%/web/%domain%/stats>
2323
AllowOverride All
2424
</Directory>
25-
Include %home%/%user%/conf/web/httpd.%domain%.conf*
25+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
2626

2727
</VirtualHost>
2828

0 commit comments

Comments
 (0)