From 07d3a18765641ca683e9e6328fd6011f8bb0c6c9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 30 Jun 2010 09:37:43 +0000
Subject: [PATCH] Fixed: FS#1232 - Apache syntax error

---
 server/conf/vhost.conf.master | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 6c6d75ed8..1a12fa8cd 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -67,6 +67,15 @@
         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='ruby' op='==' value='y'>
     <IfModule mod_ruby.c>
       <Directory {tmpl_var name='web_document_root'}>
@@ -85,15 +94,6 @@
     </IfModule>
 </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'>
     # cgi enabled
 	<Directory {tmpl_var name='document_root'}/cgi-bin>
-- 
GitLab