updated templates

This commit is contained in:
Serghey Rodin 2013-11-04 23:41:49 +02:00
commit 1c0e37e654
24 changed files with 34 additions and 34 deletions

Binary file not shown.

Binary file not shown.

View file

@ -1,4 +1,4 @@
LogFile="/var/log/httpd/domains/%domain%.log" LogFile="/var/log/%web_system%/domains/%domain%.log"
LogType=W LogType=W
LogFormat=1 LogFormat=1
LogSeparator=" " LogSeparator=" "

View file

@ -1,5 +1,5 @@
HostName %domain_idn% HostName %domain_idn%
LogFile /var/log/httpd/domains/%domain%.log LogFile /var/log/%web_system%/domains/%domain%.log
OutputDir %home%/%user%/web/%domain%/stats OutputDir %home%/%user%/web/%domain%/stats
HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist
Incremental yes Incremental yes

View file

@ -1,4 +1,4 @@
LogFile="/var/log/httpd/domains/%domain%.log" LogFile="/var/log/%web_system%/domains/%domain%.log"
LogType=W LogType=W
LogFormat=1 LogFormat=1
LogSeparator=" " LogSeparator=" "

View file

@ -29,7 +29,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups apache
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -23,7 +23,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups apache
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -28,7 +28,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups apache
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -22,7 +22,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups apache
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -37,7 +37,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups apache
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -31,7 +31,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups apache
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -8,9 +8,9 @@
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/%web_system%/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/%web_system%/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
ErrorLog /var/log/%web_system%/domains/%domain%.error.log ErrorLog /var/log/httpd/domains/%domain%.error.log
<Directory %sdocroot%> <Directory %sdocroot%>
SSLRequireSSL SSLRequireSSL
AllowOverride All AllowOverride All
@ -29,7 +29,7 @@
SSLCertificateKeyFile %ssl_key% SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca% %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* Include %home%/%user%/conf/web/shttpd.%domain%.conf*
</VirtualHost> </VirtualHost>

View file

@ -8,9 +8,9 @@
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/%web_system%/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/%web_system%/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
ErrorLog /var/log/%web_system%/domains/%domain%.error.log ErrorLog /var/log/httpd/domains/%domain%.error.log
<Directory %docroot%> <Directory %docroot%>
AllowOverride All AllowOverride All
Options +Includes -Indexes +ExecCGI Options +Includes -Indexes +ExecCGI
@ -22,7 +22,7 @@
<Directory %home%/%user%/web/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
Include %home%/%user%/conf/web/%web_system%.%domain%.conf* Include %home%/%user%/conf/web/httpd.%domain%.conf*
</VirtualHost> </VirtualHost>

View file

@ -8,9 +8,9 @@
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/%web_system%/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/%web_system%/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
ErrorLog /var/log/%web_system%/domains/%domain%.error.log ErrorLog /var/log/httpd/domains/%domain%.error.log
<Directory %sdocroot%> <Directory %sdocroot%>
SSLRequireSSL SSLRequireSSL
AllowOverride All AllowOverride All
@ -30,7 +30,7 @@
SSLCertificateKeyFile %ssl_key% SSLCertificateKeyFile %ssl_key%
%ssl_ca_str%SSLCertificateChainFile %ssl_ca% %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* Include %home%/%user%/conf/web/shttpd.%domain%.conf*
</VirtualHost> </VirtualHost>

View file

@ -8,9 +8,9 @@
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/%web_system%/domains/%domain%.bytes bytes CustomLog /var/log/httpd/domains/%domain%.bytes bytes
CustomLog /var/log/%web_system%/domains/%domain%.log combined CustomLog /var/log/httpd/domains/%domain%.log combined
ErrorLog /var/log/%web_system%/domains/%domain%.error.log ErrorLog /var/log/httpd/domains/%domain%.error.log
<Directory %docroot%> <Directory %docroot%>
AllowOverride All AllowOverride All
Options +Includes -Indexes +ExecCGI Options +Includes -Indexes +ExecCGI
@ -22,7 +22,7 @@
<Directory %home%/%user%/web/%domain%/stats> <Directory %home%/%user%/web/%domain%/stats>
AllowOverride All AllowOverride All
</Directory> </Directory>
Include %home%/%user%/conf/web/%web_system%.%domain%.conf* Include %home%/%user%/conf/web/httpd.%domain%.conf*
</VirtualHost> </VirtualHost>

View file

@ -1,5 +1,5 @@
HostName %domain_idn% HostName %domain_idn%
LogFile /var/log/httpd/domains/%domain%.log LogFile /var/log/%web_system%/domains/%domain%.log
OutputDir %home%/%user%/web/%domain%/stats OutputDir %home%/%user%/web/%domain%/stats
HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist
Incremental yes Incremental yes

View file

@ -29,7 +29,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups www-data
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -23,7 +23,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups www-data
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -28,7 +28,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups www-data
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -22,7 +22,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups www-data
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -37,7 +37,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups www-data
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -31,7 +31,7 @@
<IfModule mod_ruid2.c> <IfModule mod_ruid2.c>
RMode config RMode config
RUidGid %user% %group% RUidGid %user% %group%
RGroups %rgroups% RGroups www-data
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

View file

@ -1,4 +1,4 @@
LogFile="/var/log/httpd/domains/%domain%.log" LogFile="/var/log/%web_system%/domains/%domain%.log"
LogType=W LogType=W
LogFormat=1 LogFormat=1
LogSeparator=" " LogSeparator=" "

View file

@ -1,5 +1,5 @@
HostName %domain_idn% HostName %domain_idn%
LogFile /var/log/httpd/domains/%domain%.log LogFile /var/log/%web_system%/domains/%domain%.log
OutputDir %home%/%user%/web/%domain%/stats OutputDir %home%/%user%/web/%domain%/stats
HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist
Incremental yes Incremental yes