From 1c0e37e6547ffd27e06e6fa1b43aeaefca4baa8d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 4 Nov 2013 23:41:49 +0200 Subject: [PATCH] updated templates --- install/debian/dovecot-conf.d.tar.gz | Bin 3359 -> 0 bytes install/debian/packages.tar.gz | Bin 562 -> 0 bytes install/debian/templates/web/awstats/awstats.tpl | 2 +- .../debian/templates/web/webalizer/webalizer.tpl | 2 +- install/rhel/templates/web/awstats/awstats.tpl | 2 +- install/rhel/templates/web/httpd/basedir.stpl | 2 +- install/rhel/templates/web/httpd/basedir.tpl | 2 +- install/rhel/templates/web/httpd/default.stpl | 2 +- install/rhel/templates/web/httpd/default.tpl | 2 +- install/rhel/templates/web/httpd/hosting.stpl | 2 +- install/rhel/templates/web/httpd/hosting.tpl | 2 +- install/rhel/templates/web/httpd/phpcgi.stpl | 8 ++++---- install/rhel/templates/web/httpd/phpcgi.tpl | 8 ++++---- install/rhel/templates/web/httpd/phpfcgid.stpl | 8 ++++---- install/rhel/templates/web/httpd/phpfcgid.tpl | 8 ++++---- .../rhel/templates/web/webalizer/webalizer.tpl | 2 +- .../ubuntu/templates/web/apache2/basedir.stpl | 2 +- install/ubuntu/templates/web/apache2/basedir.tpl | 2 +- .../ubuntu/templates/web/apache2/default.stpl | 2 +- install/ubuntu/templates/web/apache2/default.tpl | 2 +- .../ubuntu/templates/web/apache2/hosting.stpl | 2 +- install/ubuntu/templates/web/apache2/hosting.tpl | 2 +- install/ubuntu/templates/web/awstats/awstats.tpl | 2 +- .../ubuntu/templates/web/webalizer/webalizer.tpl | 2 +- 24 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 install/debian/dovecot-conf.d.tar.gz delete mode 100644 install/debian/packages.tar.gz diff --git a/install/debian/dovecot-conf.d.tar.gz b/install/debian/dovecot-conf.d.tar.gz deleted file mode 100644 index a2f48487481b6d298c9866867ee35446e2d61003..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3359 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 diff --git a/install/debian/packages.tar.gz b/install/debian/packages.tar.gz deleted file mode 100644 index 4b778dadce20a61f03a8ca920ec81c55a8730fee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmV-20?qv&iwFRHoJ3Lp1MQYgkD5>vhFSY7+_9e37(#VaFxE7E(hXh3fdi2rFJZkFya3gX^b)n zVXSCG>M9q!r;?X63%1>^6fD25GP?9(Zs8i zm#eSAOO(kSvCYUG8}`JzlNGcp7>;dtR#6ZOYcoV)W|{76R22A_Q=gJo4AXSy6Mw(T z@QvYNS99i079ZTgdF&uH#Hm!H2Tkno>k1^mATb^lABoBo#r=lG9NGXU~REdk0(83B2vo&kr_ zAp~{{4=IqJS7Kl{UdaJ`lmmICl^~$|AizYY10B;!5Re`k^vG)ug3|w@mF?UAH~v$N z5%B*SfdB3Ik9DT%#Rp2&fAy{S9|r3<{gP~x+kO96-v30?!2fG-8UK&;KeGQw{$uw~ zsNXQZA^ut3x1l|*XixdCp}qF{wFdwI0000000000000000RC})0(q@EkpL(F05 RMode config RUidGid %user% %group% - RGroups %rgroups% + RGroups apache AssignUserID %user% %group% diff --git a/install/rhel/templates/web/httpd/basedir.tpl b/install/rhel/templates/web/httpd/basedir.tpl index 984fab05..41b77334 100755 --- a/install/rhel/templates/web/httpd/basedir.tpl +++ b/install/rhel/templates/web/httpd/basedir.tpl @@ -23,7 +23,7 @@ RMode config RUidGid %user% %group% - RGroups %rgroups% + RGroups apache AssignUserID %user% %group% diff --git a/install/rhel/templates/web/httpd/default.stpl b/install/rhel/templates/web/httpd/default.stpl index 0c3f190f..ffb536c5 100755 --- a/install/rhel/templates/web/httpd/default.stpl +++ b/install/rhel/templates/web/httpd/default.stpl @@ -28,7 +28,7 @@ RMode config RUidGid %user% %group% - RGroups %rgroups% + RGroups apache AssignUserID %user% %group% diff --git a/install/rhel/templates/web/httpd/default.tpl b/install/rhel/templates/web/httpd/default.tpl index e96d34d8..29de125f 100755 --- a/install/rhel/templates/web/httpd/default.tpl +++ b/install/rhel/templates/web/httpd/default.tpl @@ -22,7 +22,7 @@ RMode config RUidGid %user% %group% - RGroups %rgroups% + RGroups apache AssignUserID %user% %group% diff --git a/install/rhel/templates/web/httpd/hosting.stpl b/install/rhel/templates/web/httpd/hosting.stpl index 033d3fb0..f21c3882 100755 --- a/install/rhel/templates/web/httpd/hosting.stpl +++ b/install/rhel/templates/web/httpd/hosting.stpl @@ -37,7 +37,7 @@ RMode config RUidGid %user% %group% - RGroups %rgroups% + RGroups apache AssignUserID %user% %group% diff --git a/install/rhel/templates/web/httpd/hosting.tpl b/install/rhel/templates/web/httpd/hosting.tpl index 6dc3aadc..76a9b0b0 100755 --- a/install/rhel/templates/web/httpd/hosting.tpl +++ b/install/rhel/templates/web/httpd/hosting.tpl @@ -31,7 +31,7 @@ RMode config RUidGid %user% %group% - RGroups %rgroups% + RGroups apache AssignUserID %user% %group% diff --git a/install/rhel/templates/web/httpd/phpcgi.stpl b/install/rhel/templates/web/httpd/phpcgi.stpl index 58c4baf9..b3e6488a 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/%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 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* diff --git a/install/rhel/templates/web/httpd/phpcgi.tpl b/install/rhel/templates/web/httpd/phpcgi.tpl index 21be2cdd..952d2b49 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/%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 AllowOverride All Options +Includes -Indexes +ExecCGI @@ -22,7 +22,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain%.conf* diff --git a/install/rhel/templates/web/httpd/phpfcgid.stpl b/install/rhel/templates/web/httpd/phpfcgid.stpl index 20a58009..352d268b 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/%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 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* diff --git a/install/rhel/templates/web/httpd/phpfcgid.tpl b/install/rhel/templates/web/httpd/phpfcgid.tpl index 72e7d8d4..9826c946 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/%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 AllowOverride All Options +Includes -Indexes +ExecCGI @@ -22,7 +22,7 @@ AllowOverride All - Include %home%/%user%/conf/web/%web_system%.%domain%.conf* + Include %home%/%user%/conf/web/httpd.%domain%.conf* diff --git a/install/rhel/templates/web/webalizer/webalizer.tpl b/install/rhel/templates/web/webalizer/webalizer.tpl index 2e4fee3f..068adcfb 100755 --- 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 index 37368a64..96de57af 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 %rgroups% + RGroups www-data AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/basedir.tpl b/install/ubuntu/templates/web/apache2/basedir.tpl index 984fab05..07ec38c9 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 %rgroups% + RGroups www-data AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/default.stpl b/install/ubuntu/templates/web/apache2/default.stpl index 0c3f190f..da523c13 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 %rgroups% + RGroups www-data AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/default.tpl b/install/ubuntu/templates/web/apache2/default.tpl index e96d34d8..b95c1ee3 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 %rgroups% + RGroups www-data AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/hosting.stpl b/install/ubuntu/templates/web/apache2/hosting.stpl index 033d3fb0..49af8fce 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 %rgroups% + RGroups www-data AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/apache2/hosting.tpl b/install/ubuntu/templates/web/apache2/hosting.tpl index 6dc3aadc..8763b1a9 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 %rgroups% + RGroups www-data AssignUserID %user% %group% diff --git a/install/ubuntu/templates/web/awstats/awstats.tpl b/install/ubuntu/templates/web/awstats/awstats.tpl index 274c5ed3..9a92e0fd 100755 --- 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 index 2e4fee3f..068adcfb 100755 --- 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