updated templates

serghey-rodin · serghey-rodin · commit 1c0e37e6547f · 2013-11-04T23:41:49.000+02:00
diff --git a/install/debian/dovecot-conf.d.tar.gz b/install/debian/dovecot-conf.d.tar.gz
diff --git a/install/debian/packages.tar.gz b/install/debian/packages.tar.gz
diff --git a/install/debian/templates/web/awstats/awstats.tpl b/install/debian/templates/web/awstats/awstats.tpl
@@ -1,4 +1,4 @@
-LogFile="/var/log/httpd/domains/%domain%.log"
+LogFile="/var/log/%web_system%/domains/%domain%.log"
 LogType=W
 LogFormat=1
 LogSeparator=" "
diff --git a/install/debian/templates/web/webalizer/webalizer.tpl b/install/debian/templates/web/webalizer/webalizer.tpl
@@ -1,5 +1,5 @@
 HostName         %domain_idn%
-LogFile          /var/log/httpd/domains/%domain%.log
+LogFile          /var/log/%web_system%/domains/%domain%.log
 OutputDir        %home%/%user%/web/%domain%/stats
 HistoryName      %home%/%user%/web/%domain%/stats/%domain%.hist
 Incremental      yes
diff --git a/install/rhel/templates/web/awstats/awstats.tpl b/install/rhel/templates/web/awstats/awstats.tpl
@@ -1,4 +1,4 @@
-LogFile="/var/log/httpd/domains/%domain%.log"
+LogFile="/var/log/%web_system%/domains/%domain%.log"
 LogType=W
 LogFormat=1
 LogSeparator=" "
diff --git a/install/rhel/templates/web/httpd/basedir.stpl b/install/rhel/templates/web/httpd/basedir.stpl
@@ -29,7 +29,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups apache
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/rhel/templates/web/httpd/basedir.tpl b/install/rhel/templates/web/httpd/basedir.tpl
@@ -23,7 +23,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups apache
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/rhel/templates/web/httpd/default.stpl b/install/rhel/templates/web/httpd/default.stpl
@@ -28,7 +28,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups apache
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/rhel/templates/web/httpd/default.tpl b/install/rhel/templates/web/httpd/default.tpl
@@ -22,7 +22,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups apache
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/rhel/templates/web/httpd/hosting.stpl b/install/rhel/templates/web/httpd/hosting.stpl
@@ -37,7 +37,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups apache
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/rhel/templates/web/httpd/hosting.tpl b/install/rhel/templates/web/httpd/hosting.tpl
@@ -31,7 +31,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups apache
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/rhel/templates/web/httpd/phpcgi.stpl b/install/rhel/templates/web/httpd/phpcgi.stpl
@@ -8,9 +8,9 @@
     Alias /vstats/ %home%/%user%/web/%domain%/stats/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     SuexecUserGroup %user% %group%
-    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
-    CustomLog /var/log/%web_system%/domains/%domain%.log combined
-    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.log combined
+    ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %sdocroot%>
         SSLRequireSSL
         AllowOverride All
@@ -29,7 +29,7 @@
     SSLCertificateKeyFile %ssl_key%
     %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>
 
diff --git a/install/rhel/templates/web/httpd/phpcgi.tpl b/install/rhel/templates/web/httpd/phpcgi.tpl
@@ -8,9 +8,9 @@
     Alias /vstats/ %home%/%user%/web/%domain%/stats/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     SuexecUserGroup %user% %group%
-    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
-    CustomLog /var/log/%web_system%/domains/%domain%.log combined
-    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.log combined
+    ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/templates/web/httpd/phpfcgid.stpl b/install/rhel/templates/web/httpd/phpfcgid.stpl
@@ -8,9 +8,9 @@
     Alias /vstats/ %home%/%user%/web/%domain%/stats/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     SuexecUserGroup %user% %group%
-    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
-    CustomLog /var/log/%web_system%/domains/%domain%.log combined
-    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.log combined
+    ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %sdocroot%>
         SSLRequireSSL
         AllowOverride All
@@ -30,7 +30,7 @@
     SSLCertificateKeyFile %ssl_key%
     %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>
 
diff --git a/install/rhel/templates/web/httpd/phpfcgid.tpl b/install/rhel/templates/web/httpd/phpfcgid.tpl
@@ -8,9 +8,9 @@
     Alias /vstats/ %home%/%user%/web/%domain%/stats/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     SuexecUserGroup %user% %group%
-    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
-    CustomLog /var/log/%web_system%/domains/%domain%.log combined
-    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    CustomLog /var/log/httpd/domains/%domain%.bytes bytes
+    CustomLog /var/log/httpd/domains/%domain%.log combined
+    ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/templates/web/webalizer/webalizer.tpl b/install/rhel/templates/web/webalizer/webalizer.tpl
@@ -1,5 +1,5 @@
 HostName         %domain_idn%
-LogFile          /var/log/httpd/domains/%domain%.log
+LogFile          /var/log/%web_system%/domains/%domain%.log
 OutputDir        %home%/%user%/web/%domain%/stats
 HistoryName      %home%/%user%/web/%domain%/stats/%domain%.hist
 Incremental      yes
diff --git a/install/ubuntu/templates/web/apache2/basedir.stpl b/install/ubuntu/templates/web/apache2/basedir.stpl
@@ -29,7 +29,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups www-data
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/ubuntu/templates/web/apache2/basedir.tpl b/install/ubuntu/templates/web/apache2/basedir.tpl
@@ -23,7 +23,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups www-data
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/ubuntu/templates/web/apache2/default.stpl b/install/ubuntu/templates/web/apache2/default.stpl
@@ -28,7 +28,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups www-data
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/ubuntu/templates/web/apache2/default.tpl b/install/ubuntu/templates/web/apache2/default.tpl
@@ -22,7 +22,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups www-data
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/ubuntu/templates/web/apache2/hosting.stpl b/install/ubuntu/templates/web/apache2/hosting.stpl
@@ -37,7 +37,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups www-data
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/ubuntu/templates/web/apache2/hosting.tpl b/install/ubuntu/templates/web/apache2/hosting.tpl
@@ -31,7 +31,7 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups %rgroups%
+        RGroups www-data
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
diff --git a/install/ubuntu/templates/web/awstats/awstats.tpl b/install/ubuntu/templates/web/awstats/awstats.tpl
@@ -1,4 +1,4 @@
-LogFile="/var/log/httpd/domains/%domain%.log"
+LogFile="/var/log/%web_system%/domains/%domain%.log"
 LogType=W
 LogFormat=1
 LogSeparator=" "
diff --git a/install/ubuntu/templates/web/webalizer/webalizer.tpl b/install/ubuntu/templates/web/webalizer/webalizer.tpl
@@ -1,5 +1,5 @@
 HostName         %domain_idn%
-LogFile          /var/log/httpd/domains/%domain%.log
+LogFile          /var/log/%web_system%/domains/%domain%.log
 OutputDir        %home%/%user%/web/%domain%/stats
 HistoryName      %home%/%user%/web/%domain%/stats/%domain%.hist
 Incremental      yes

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-LogFile="/var/log/httpd/domains/%domain%.log"`
	`1`	`+LogFile="/var/log/%web_system%/domains/%domain%.log"`
`2`	`2`	`LogType=W`
`3`	`3`	`LogFormat=1`
`4`	`4`	`LogSeparator=" "`