diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index 6c6d75ed8a8673e5f37e1cfb3d64268a8d38d577..1a12fa8cd4729c842c391904fd37261232bc0f8d 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>