From 47ba7d763e8b38e683e595ee723c797219015aac Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sat, 5 Oct 2013 13:49:08 +0300 Subject: [PATCH] Adding RGROUPS var to make templates platform independent --- install/rhel/templates/web/httpd/basedir.stpl | 10 ++++----- install/rhel/templates/web/httpd/basedir.tpl | 10 ++++----- install/rhel/templates/web/httpd/default.stpl | 10 ++++----- install/rhel/templates/web/httpd/default.tpl | 10 ++++----- install/rhel/templates/web/httpd/hosting.stpl | 10 ++++----- install/rhel/templates/web/httpd/hosting.tpl | 10 ++++----- install/rhel/templates/web/httpd/phpcgi.stpl | 8 +++---- install/rhel/templates/web/httpd/phpcgi.tpl | 8 +++---- .../rhel/templates/web/httpd/phpfcgid.stpl | 8 +++---- install/rhel/templates/web/httpd/phpfcgid.tpl | 8 +++---- install/rhel/vesta.conf | 22 +++++++++++++++++++ .../ubuntu/templates/web/apache2/basedir.stpl | 2 +- .../ubuntu/templates/web/apache2/basedir.tpl | 2 +- .../ubuntu/templates/web/apache2/default.stpl | 2 +- .../ubuntu/templates/web/apache2/default.tpl | 2 +- .../ubuntu/templates/web/apache2/hosting.stpl | 2 +- .../ubuntu/templates/web/apache2/hosting.tpl | 2 +- install/ubuntu/vesta.conf | 1 + 18 files changed, 75 insertions(+), 52 deletions(-) create mode 100644 install/rhel/vesta.conf diff --git a/install/rhel/templates/web/httpd/basedir.stpl b/install/rhel/templates/web/httpd/basedir.stpl index 2ddffdcdc..37368a64a 100755 --- a/install/rhel/templates/web/httpd/basedir.stpl +++ b/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 AllowOverride All SSLRequireSSL @@ -29,13 +29,13 @@ RMode config RUidGid %user% %group% - RGroups apache + RGroups %rgroups% AssignUserID %user% %group% - Include %home%/%user%/conf/web/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/basedir.tpl b/install/rhel/templates/web/httpd/basedir.tpl index c821ad358..984fab05e 100755 --- a/install/rhel/templates/web/httpd/basedir.tpl +++ b/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 AllowOverride All Options +Includes -Indexes +ExecCGI @@ -23,13 +23,13 @@ RMode config RUidGid %user% %group% - RGroups apache + RGroups %rgroups% AssignUserID %user% %group% - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/default.stpl b/install/rhel/templates/web/httpd/default.stpl index 9a753d5ae..0c3f190f7 100755 --- a/install/rhel/templates/web/httpd/default.stpl +++ b/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 AllowOverride All SSLRequireSSL @@ -28,13 +28,13 @@ RMode config RUidGid %user% %group% - RGroups apache + RGroups %rgroups% AssignUserID %user% %group% - Include %home%/%user%/conf/web/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/default.tpl b/install/rhel/templates/web/httpd/default.tpl index e85540a55..e96d34d8a 100755 --- a/install/rhel/templates/web/httpd/default.tpl +++ b/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 AllowOverride All Options +Includes -Indexes +ExecCGI @@ -22,13 +22,13 @@ RMode config RUidGid %user% %group% - RGroups apache + RGroups %rgroups% AssignUserID %user% %group% - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/hosting.stpl b/install/rhel/templates/web/httpd/hosting.stpl index dd5956a13..033d3fb0b 100755 --- a/install/rhel/templates/web/httpd/hosting.stpl +++ b/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 AllowOverride All SSLRequireSSL @@ -37,13 +37,13 @@ RMode config RUidGid %user% %group% - RGroups apache + RGroups %rgroups% AssignUserID %user% %group% - Include %home%/%user%/conf/web/shttpd.%domain%.conf* + Include %home%/%user%/conf/web/s%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/hosting.tpl b/install/rhel/templates/web/httpd/hosting.tpl index 7eff4dd85..6dc3aadcb 100755 --- a/install/rhel/templates/web/httpd/hosting.tpl +++ b/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 AllowOverride All Options +Includes -Indexes +ExecCGI @@ -31,13 +31,13 @@ RMode config RUidGid %user% %group% - RGroups apache + RGroups %rgroups% AssignUserID %user% %group% - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/phpcgi.stpl b/install/rhel/templates/web/httpd/phpcgi.stpl index b3e6488a6..58c4baf90 100755 --- 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/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 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* diff --git a/install/rhel/templates/web/httpd/phpcgi.tpl b/install/rhel/templates/web/httpd/phpcgi.tpl index 952d2b493..21be2cdd7 100755 --- 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/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 AllowOverride All Options +Includes -Indexes +ExecCGI @@ -22,7 +22,7 @@ AllowOverride All - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/phpfcgid.stpl b/install/rhel/templates/web/httpd/phpfcgid.stpl index 352d268b6..20a580093 100755 --- 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/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 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* diff --git a/install/rhel/templates/web/httpd/phpfcgid.tpl b/install/rhel/templates/web/httpd/phpfcgid.tpl index 9826c9464..72e7d8d44 100755 --- 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/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 AllowOverride All Options +Includes -Indexes +ExecCGI @@ -22,7 +22,7 @@ AllowOverride All - Include %home%/%user%/conf/web/httpd.%domain%.conf* + Include %home%/%user%/conf/web/%web_system%.%domain%.conf* diff --git a/install/rhel/vesta.conf b/install/rhel/vesta.conf new file mode 100644 index 000000000..d4849c067 --- /dev/null +++ b/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' diff --git a/install/ubuntu/templates/web/apache2/basedir.stpl b/install/ubuntu/templates/web/apache2/basedir.stpl index 96de57af7..37368a64a 100755 --- a/install/ubuntu/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/templates/web/apache2/basedir.stpl @@ -29,7 +29,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups %rgroups% AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/basedir.tpl b/install/ubuntu/templates/web/apache2/basedir.tpl index 07ec38c98..984fab05e 100755 --- a/install/ubuntu/templates/web/apache2/basedir.tpl +++ b/install/ubuntu/templates/web/apache2/basedir.tpl @@ -23,7 +23,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups %rgroups% AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/default.stpl b/install/ubuntu/templates/web/apache2/default.stpl index da523c138..0c3f190f7 100755 --- a/install/ubuntu/templates/web/apache2/default.stpl +++ b/install/ubuntu/templates/web/apache2/default.stpl @@ -28,7 +28,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups %rgroups% AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/default.tpl b/install/ubuntu/templates/web/apache2/default.tpl index b95c1ee38..e96d34d8a 100755 --- a/install/ubuntu/templates/web/apache2/default.tpl +++ b/install/ubuntu/templates/web/apache2/default.tpl @@ -22,7 +22,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups %rgroups% AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/hosting.stpl b/install/ubuntu/templates/web/apache2/hosting.stpl index 49af8fcef..033d3fb0b 100755 --- a/install/ubuntu/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/templates/web/apache2/hosting.stpl @@ -37,7 +37,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups %rgroups% AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/hosting.tpl b/install/ubuntu/templates/web/apache2/hosting.tpl index 8763b1a90..6dc3aadcb 100755 --- a/install/ubuntu/templates/web/apache2/hosting.tpl +++ b/install/ubuntu/templates/web/apache2/hosting.tpl @@ -31,7 +31,7 @@ RMode config RUidGid %user% %group% - RGroups www-data + RGroups %rgroups% AssignUserID %user% %group% diff --git a/install/ubuntu/vesta.conf b/install/ubuntu/vesta.conf index fd9e659ad..00e205f55 100644 --- a/install/ubuntu/vesta.conf +++ b/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'