github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding RGROUPS var to make templates platform independent

Browse source
This commit is contained in:
Serghey Rodin 2013-10-05 13:49:08 +03:00
commit 47ba7d763e
18 changed files with 75 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

8
install/rhel/templates/web/httpd/phpcgi.stpl
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/httpd/domains/%domain%.bytes bytes CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/%web_system%/domains/%domain%.log combined
ErrorLog /var/log/httpd/domains/%domain%.error.log ErrorLog /var/log/%web_system%/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/shttpd.%domain%.conf* Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost> </VirtualHost>

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

8
install/rhel/templates/web/httpd/phpfcgid.stpl
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/httpd/domains/%domain%.bytes bytes CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
CustomLog /var/log/httpd/domains/%domain%.log combined CustomLog /var/log/%web_system%/domains/%domain%.log combined
ErrorLog /var/log/httpd/domains/%domain%.error.log ErrorLog /var/log/%web_system%/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/shttpd.%domain%.conf* Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
</VirtualHost> </VirtualHost>

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

22
install/rhel/vesta.conf Normal file
View file

@ -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'

2
install/ubuntu/templates/web/apache2/basedir.stpl
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 www-data RGroups %rgroups%
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

2
install/ubuntu/templates/web/apache2/basedir.tpl
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 www-data RGroups %rgroups%
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

2
install/ubuntu/templates/web/apache2/default.stpl
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 www-data RGroups %rgroups%
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

2
install/ubuntu/templates/web/apache2/default.tpl
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 www-data RGroups %rgroups%
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

2
install/ubuntu/templates/web/apache2/hosting.stpl
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 www-data RGroups %rgroups%
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

2
install/ubuntu/templates/web/apache2/hosting.tpl
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 www-data RGroups %rgroups%
</IfModule> </IfModule>
<IfModule itk.c> <IfModule itk.c>
AssignUserID %user% %group% AssignUserID %user% %group%

1
install/ubuntu/vesta.conf
View file

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