From 9994de85fcf14a98dcc54cc7399b87e34d9b3c29 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 17 Mar 2009 09:23:07 -0400
Subject: [PATCH] Updated all language files.
---
server/conf/vhost.conf.master | 104 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 47 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 04f60b8..b531185 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
@@ -47,33 +47,14 @@
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
Order allow,deny
@@ -86,29 +67,10 @@
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>
@@ -145,6 +107,10 @@
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
@@ -162,7 +128,7 @@
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>
@@ -212,8 +178,49 @@
<tmpl_if name='has_bundle_cert'>
SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.bundle
</tmpl_if>
+
+ <Directory {tmpl_var name='web_document_root_www'}>
+ Options FollowSymLinks
+ AllowOverride Indexes AuthConfig Limit FileInfo
+ 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 Indexes AuthConfig Limit FileInfo
+ 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
ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
AddHandler cgi-script .cgi
@@ -239,7 +246,7 @@
<tmpl_if name='php' op='==' value='suphp'>
# suphp enabled
suPHP_Engine on
- suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+ # 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
</tmpl_if>
@@ -248,6 +255,10 @@
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
@@ -264,9 +275,8 @@
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>
--
Gitblit v1.9.1