Adding RGROUPS var to make templates platform independent

install/rhel/templates/web/httpd/basedir.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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <Directory %sdocroot%>
         AllowOverride All
         SSLRequireSSL
@@ -29,13 +29,13 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups apache
+        RGroups %rgroups%
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/rhel/templates/web/httpd/basedir.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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
@@ -23,13 +23,13 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups apache
+        RGroups %rgroups%
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/httpd.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/rhel/templates/web/httpd/default.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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <Directory %sdocroot%>
         AllowOverride All
         SSLRequireSSL
@@ -28,13 +28,13 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups apache
+        RGroups %rgroups%
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/rhel/templates/web/httpd/default.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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
@@ -22,13 +22,13 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups apache
+        RGroups %rgroups%
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/httpd.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/rhel/templates/web/httpd/hosting.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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <Directory %sdocroot%>
         AllowOverride All
         SSLRequireSSL
@@ -37,13 +37,13 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups apache
+        RGroups %rgroups%
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/rhel/templates/web/httpd/hosting.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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
@@ -31,13 +31,13 @@
     <IfModule mod_ruid2.c>
         RMode config
         RUidGid %user% %group%
-        RGroups apache
+        RGroups %rgroups%
     </IfModule>
     <IfModule itk.c>
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/httpd.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

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

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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <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/httpd.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

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

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/httpd/domains/%domain%.bytes bytes
-    CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+    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
     <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/httpd.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 

install/rhel/vesta.conf

@@ -0,0 +1,22 @@
+WEB_SYSTEM='httpd'
+WEB_RGROUPS='apache'
+WEB_PORT='8080'
+WEB_SSL='mod_ssl'
+WEB_SSL_PORT='8443'
+PROXY_SYSTEM='nginx'
+PROXY_PORT='80'
+PROXY_SSL_PORT='443'
+FTP_SYSTEM='vsftpd'
+MAIL_SYSTEM='exim'
+IMAP_SYSTEM='dovecot'
+ANTIVIRUS_SYSTEM='clamav'
+ANTISPAM_SYSTEM='spamassassin'
+DB_SYSTEM='mysql'
+DNS_SYSTEM='named'
+STATS_SYSTEM='webalizer,awstats'
+BACKUP_SYSTEM='local'
+CRON_SYSTEM='crond'
+DISK_QUOTA='no'
+REPOSITORY='cmmnt'
+VERSION='0.9.8'
+LANGUAGE='en'

install/ubuntu/templates/web/apache2/basedir.stpl

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

install/ubuntu/templates/web/apache2/basedir.tpl

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

install/ubuntu/templates/web/apache2/default.stpl

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

install/ubuntu/templates/web/apache2/default.tpl

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

install/ubuntu/templates/web/apache2/hosting.stpl

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

install/ubuntu/templates/web/apache2/hosting.tpl

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

install/ubuntu/vesta.conf

@@ -1,4 +1,5 @@
 WEB_SYSTEM='apache2'
+WEB_RGROUPS='www-data'
 WEB_PORT='8080'
 WEB_SSL='mod_ssl'
 WEB_SSL_PORT='8443'