From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
server/conf/vhost.conf.master | 315 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 250 insertions(+), 65 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 04f60b8..89b0931 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -1,5 +1,5 @@
-<Directory /var/www/{tmpl_var name='domain'}>
+<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
AllowOverride None
Order Deny,Allow
Deny from all
@@ -18,11 +18,12 @@
ServerName <tmpl_var name='domain'>
<tmpl_if name='alias'>
- ServerAlias <tmpl_var name='alias'>
+ <tmpl_var name='alias'>
</tmpl_if>
ServerAdmin webmaster@<tmpl_var name='domain'>
ErrorLog /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log
+
<tmpl_if name='errordocs'>
ErrorDocument 400 /error/400.html
@@ -36,7 +37,7 @@
<Directory {tmpl_var name='web_document_root_www'}>
Options FollowSymLinks
- AllowOverride Indexes AuthConfig Limit FileInfo
+ AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
<tmpl_if name='ssi' op='==' value='y'>
@@ -47,35 +48,16 @@
Options +Includes
</tmpl_if>
<tmpl_if name='php' op='==' value='no'>
- <Files ~ '.php$'>
+ <Files ~ '.php[s3-6]{0,1}$'>
Order allow,deny
Deny from all
Allow from none
- </Files>
- <Files ~ '.php3$'>
- Order allow,deny
- Deny from all
- Allow from none
- </Files>
- <Files ~ '.php4$'>
- Order allow,deny
- Deny from all
- Allow from none
- </Files>
- <Files ~ '.php5$'>
- Order allow,deny
- Deny from all
- Allow from none
- </Files>
- <Files ~ '.phps'>
- Order deny,allow
- Allow from all
</Files>
</tmpl_if>
</Directory>
- <Directory {tmpl_var name='web_document_root'}>
+ <Directory {tmpl_var name='web_document_root'}>
Options FollowSymLinks
- AllowOverride Indexes AuthConfig Limit FileInfo
+ AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
<tmpl_if name='ssi' op='==' value='y'>
@@ -86,35 +68,38 @@
Options +Includes
</tmpl_if>
<tmpl_if name='php' op='==' value='no'>
- <Files ~ '.php$'>
+ <Files ~ '.php[s3-6]{0,1}$'>
Order allow,deny
Deny from all
Allow from none
- </Files>
- <Files ~ '.php3$'>
- Order allow,deny
- Deny from all
- Allow from none
- </Files>
- <Files ~ '.php4$'>
- Order allow,deny
- Deny from all
- Allow from none
- </Files>
- <Files ~ '.php5$'>
- Order allow,deny
- Deny from all
- Allow from none
- </Files>
- <Files ~ '.phps'>
- Order deny,allow
- Allow from all
</Files>
</tmpl_if>
</Directory>
+<tmpl_if name='ruby' op='==' value='y'>
+ <IfModule mod_ruby.c>
+ <Directory {tmpl_var name='web_document_root'}>
+ Options +ExecCGI
+ </Directory>
+ RubyRequire apache/ruby-run
+ #RubySafeLevel 0
+ <Files *.rb>
+ SetHandler ruby-object
+ RubyHandler Apache::RubyRun.instance
+ </Files>
+ <Files *.rbx>
+ SetHandler ruby-object
+ RubyHandler Apache::RubyRun.instance
+ </Files>
+ </IfModule>
+</tmpl_if>
+
<tmpl_if name='cgi' op='==' value='y'>
# cgi enabled
+ <Directory {tmpl_var name='document_root'}/cgi-bin>
+ Order allow,deny
+ Allow from all
+ </Directory>
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
AddHandler cgi-script .cgi
AddHandler cgi-script .pl
@@ -123,21 +108,33 @@
# suexec enabled
SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
</tmpl_if>
+ # Clear PHP settings of this website
+ <FilesMatch "\.ph(p3?|tml)$">
+ SetHandler None
+ </FilesMatch>
<tmpl_if name='php' op='==' value='mod'>
# mod_php enabled
AddType application/x-httpd-php .php .php3 .php4 .php5
- php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
+ php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
- #php_admin_value open_basedir <tmpl_var name='document_root'>:/usr/share/php5
+ # PHPIniDir <tmpl_var name='custom_php_ini_dir'>
+<tmpl_if name='security_level' op='==' value='20'>
+ php_admin_value open_basedir <tmpl_var name='php_open_basedir'>
+</tmpl_if>
</tmpl_if>
<tmpl_if name='php' op='==' value='suphp'>
# suphp enabled
<Directory {tmpl_var name='web_document_root'}>
+ <IfModule mod_suphp.c>
suPHP_Engine on
# suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+<tmpl_if name='has_custom_php_ini'>
+ suPHP_ConfigPath <tmpl_var name='custom_php_ini_dir'>
+</tmpl_if>
AddHandler x-httpd-suphp .php .php3 .php4 .php5
suPHP_AddHandler x-httpd-suphp
+ </IfModule>
</Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='cgi'>
@@ -145,14 +142,68 @@
ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
Action php5-cgi /php5-cgi
AddHandler php5-cgi .php .php3 .php4 .php5
+ <Directory {tmpl_var name='cgi_starter_path'}>
+ Order allow,deny
+ Allow from all
+ </Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
# php as fast-cgi enabled
+ <IfModule mod_fcgid.c>
+
+ # SocketPath /tmp/fcgid_sock/
+
+ # IdleTimeout n (3600 seconds)
+ # An idle fastcgi application will be terminated after IdleTimeout seconds.
+ IdleTimeout 3600
+
+ # ProcessLifeTime n (7200 seconds)
+ # A fastcgi application will be terminated if lifetime expired, even no error is detected.
+ ProcessLifeTime 7200
+
+ # MaxProcessCount n (1000)
+ # The max count of total fastcgi process count.
+ # MaxProcessCount 1000
+
+ # DefaultMinClassProcessCount n (3)
+ # The minimum number of fastcgi application instances for any one fastcgi application.
+ # Idle fastcgi will not be killed if their count is less than n
+ # Set this to 0, and tweak IdleTimeout
+ DefaultMinClassProcessCount 0
+
+ # DefaultMaxClassProcessCount n (100)
+ # The maximum number of fastcgi application instances allowed to run for
+ # particular one fastcgi application.
+ DefaultMaxClassProcessCount 100
+
+ # IPCConnectTimeout n (3 seconds)
+ # The connect timeout to a fastcgi application.
+ IPCConnectTimeout 8
+
+ # IPCCommTimeout n (20 seconds)
+ # The communication timeout to a fastcgi application. Please increase this
+ # value if your CGI have a slow initialization or slow respond.
+ IPCCommTimeout 360
+
+ # BusyTimeout n (300 seconds)
+ # A fastcgi application will be terminated if handing a single request
+ # longer than busy timeout.
+ BusyTimeout 300
+
+ </IfModule>
<Directory {tmpl_var name='web_document_root_www'}>
AddHandler fcgid-script .php .php3 .php4 .php5
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
Options +ExecCGI
- AllowOverride all
+ AllowOverride <tmpl_var name='allow_override'>
+ Order allow,deny
+ Allow from all
+ </Directory>
+ <Directory {tmpl_var name='web_document_root'}>
+ AddHandler fcgid-script .php .php3 .php4 .php5
+ FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
+ Options +ExecCGI
+ AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
</Directory>
@@ -162,9 +213,21 @@
RewriteEngine on
<tmpl_loop name="redirects">
RewriteCond %{HTTP_HOST} ^<tmpl_var name='rewrite_domain'> [NC]
- RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
+ RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>
</tmpl_loop>
</tmpl_if>
+
+ # add support for apache mpm_itk
+ <IfModule mpm_itk_module>
+ AssignUserId <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+ </IfModule>
+
+ <IfModule mod_dav_fs.c>
+ # DO NOT REMOVE THE COMMENTS!
+ # IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
+ # WEBDAV BEGIN
+ # WEBDAV END
+ </IfModule>
<tmpl_var name='apache_directives'>
</VirtualHost>
@@ -188,9 +251,9 @@
</tmpl_if>
</tmpl_if>
- ServerName <tmpl_var name='domain'>
+ ServerName <tmpl_var name='ssl_domain'>
<tmpl_if name='alias'>
- ServerAlias <tmpl_var name='alias'>
+ <tmpl_var name='alias'>
</tmpl_if>
ServerAdmin webmaster@<tmpl_var name='domain'>
@@ -207,14 +270,59 @@
</tmpl_if>
SSLEngine on
- SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.crt
- SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.key
+ SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt
+ SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key
<tmpl_if name='has_bundle_cert'>
- SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.bundle
+ SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle
</tmpl_if>
+
+ <Directory {tmpl_var name='web_document_root_www'}>
+ Options FollowSymLinks
+ AllowOverride <tmpl_var name='allow_override'>
+ Order allow,deny
+ Allow from all
+<tmpl_if name='ssi' op='==' value='y'>
+
+ # ssi enabled
+ AddType text/html .shtml
+ AddOutputFilter INCLUDES .shtml
+ Options +Includes
+</tmpl_if>
+<tmpl_if name='php' op='==' value='no'>
+ <Files ~ '.php[s3-6]{0,1}$'>
+ Order allow,deny
+ Deny from all
+ Allow from none
+ </Files>
+</tmpl_if>
+ </Directory>
+ <Directory {tmpl_var name='web_document_root'}>
+ Options FollowSymLinks
+ AllowOverride <tmpl_var name='allow_override'>
+ Order allow,deny
+ Allow from all
+<tmpl_if name='ssi' op='==' value='y'>
+
+ # ssi enabled
+ AddType text/html .shtml
+ AddOutputFilter INCLUDES .shtml
+ Options +Includes
+</tmpl_if>
+<tmpl_if name='php' op='==' value='no'>
+ <Files ~ '.php[s3-6]{0,1}$'>
+ Order allow,deny
+ Deny from all
+ Allow from none
+ </Files>
+</tmpl_if>
+ </Directory>
-<tmpl_if name='cgi'op='==' value='y'>
+<tmpl_if name='cgi' op='==' value='y'>
# cgi enabled
+ <Directory {tmpl_var name='document_root'}/cgi-bin>
+ Order allow,deny
+ Allow from all
+ </Directory>
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
AddHandler cgi-script .cgi
AddHandler cgi-script .pl
@@ -228,34 +336,100 @@
# suexec enabled
SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
</tmpl_if>
+# Clear PHP settings of this website
+ <FilesMatch "\.ph(p3?|tml)$">
+ SetHandler None
+ </FilesMatch>
<tmpl_if name='php' op='==' value='mod'>
# mod_php enabled
AddType application/x-httpd-php .php .php3 .php4 .php5
- php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
+ php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
- #php_admin_value open_basedir <tmpl_var name='document_root'>:/usr/share/php5
+ # PHPIniDir <tmpl_var name='custom_php_ini_dir'>
+<tmpl_if name='security_level' op='==' value='20'>
+ php_admin_value open_basedir <tmpl_var name='php_open_basedir'>
+</tmpl_if>
</tmpl_if>
<tmpl_if name='php' op='==' value='suphp'>
# suphp enabled
- suPHP_Engine on
- suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
- AddHandler x-httpd-php .php .php3 .php4 .php5
- suPHP_AddHandler x-httpd-php
+ <Directory {tmpl_var name='web_document_root'}>
+ <IfModule mod_suphp.c>
+ suPHP_Engine on
+ # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+<tmpl_if name='has_custom_php_ini'>
+ suPHP_ConfigPath <tmpl_var name='custom_php_ini_dir'>
+</tmpl_if>
+ AddHandler x-httpd-suphp .php .php3 .php4 .php5
+ suPHP_AddHandler x-httpd-suphp
+ </IfModule>
+ </Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='cgi'>
# php as cgi enabled
ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
Action php5-cgi /php5-cgi
AddHandler php5-cgi .php .php3 .php4 .php5
+ <Directory {tmpl_var name='cgi_starter_path'}>
+ Order allow,deny
+ Allow from all
+ </Directory>
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
# php as fast-cgi enabled
+ <IfModule mod_fcgid.c>
+ # SocketPath /tmp/fcgid_sock/
+ # IdleTimeout n (3600 seconds)
+ # An idle fastcgi application will be terminated after IdleTimeout seconds.
+ IdleTimeout 3600
+
+ # ProcessLifeTime n (7200 seconds)
+ # A fastcgi application will be terminated if lifetime expired, even no error is detected.
+ ProcessLifeTime 7200
+
+ # MaxProcessCount n (1000)
+ # The max count of total fastcgi process count.
+ # MaxProcessCount 1000
+
+ # DefaultMinClassProcessCount n (3)
+ # The minimum number of fastcgi application instances for any one fastcgi application.
+ # Idle fastcgi will not be killed if their count is less than n
+ # Set this to 0, and tweak IdleTimeout
+ DefaultMinClassProcessCount 0
+
+ # DefaultMaxClassProcessCount n (100)
+ # The maximum number of fastcgi application instances allowed to run for
+ # particular one fastcgi application.
+ DefaultMaxClassProcessCount 100
+
+ # IPCConnectTimeout n (3 seconds)
+ # The connect timeout to a fastcgi application.
+ IPCConnectTimeout 8
+
+ # IPCCommTimeout n (20 seconds)
+ # The communication timeout to a fastcgi application. Please increase this
+ # value if your CGI have a slow initialization or slow respond.
+ IPCCommTimeout 360
+
+ # BusyTimeout n (300 seconds)
+ # A fastcgi application will be terminated if handing a single request
+ # longer than busy timeout.
+ BusyTimeout 300
+
+ </IfModule>
<Directory {tmpl_var name='web_document_root_www'}>
AddHandler fcgid-script .php .php3 .php4 .php5
FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
Options +ExecCGI
- AllowOverride all
+ AllowOverride <tmpl_var name='allow_override'>
+ Order allow,deny
+ Allow from all
+ </Directory>
+ <Directory {tmpl_var name='web_document_root'}>
+ AddHandler fcgid-script .php .php3 .php4 .php5
+ FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
+ Options +ExecCGI
+ AllowOverride <tmpl_var name='allow_override'>
Order allow,deny
Allow from all
</Directory>
@@ -264,14 +438,25 @@
RewriteEngine on
<tmpl_loop name="redirects">
-
RewriteCond %{HTTP_HOST} ^<tmpl_var name='rewrite_domain'> [NC]
- RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 [<tmpl_var name='rewrite_type'>]
+ RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>
</tmpl_loop>
</tmpl_if>
+
+ # add support for apache mpm_itk
+ <IfModule mpm_itk_module>
+ AssignUserId <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+ </IfModule>
+
+ <IfModule mod_dav_fs.c>
+ # DO NOT REMOVE THE COMMENTS!
+ # IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
+ # WEBDAV BEGIN
+ # WEBDAV END
+ </IfModule>
<tmpl_var name='apache_directives'>
</VirtualHost>
</IfModule>
-</tmpl_if>
\ No newline at end of file
+</tmpl_if>
--
Gitblit v1.9.1