From 14d0c80aaef17bd9642cac3bc803bf05f82aaedf Mon Sep 17 00:00:00 2001
From: lfield <Laurence.Field@cern.ch>
Date: Wed, 8 Aug 2018 11:49:25 +0200
Subject: [PATCH] Update make_project

---
 tools/make_project | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/tools/make_project b/tools/make_project
index d616d17e7c..de91227dba 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -360,53 +360,40 @@ print >>open(httpd_conf_template_filename,'w'), '''
     Alias /%(project_shortname)s_ops %(proot)s/html/ops
     ScriptAlias /%(project_shortname)s_cgi %(proot)s/cgi-bin
 
-    # in the following, the "Order" and "Allow" lines are for Apache 2.2;
-    # for Apache 2.4, replace them with the single line
-    # Require all granted
-    #        or
-    # Require all denied
-
     # NOTE: Turn off access to certain default directories
     <Directory "%(proot)s/keys">
-        Order deny,allow
-        Deny from all
+        Require all denied
     </Directory>
     <Directory "%(proot)s/upload">
-        Order deny,allow
-        Deny from all
+        Require all denied
     </Directory>
 
     # NOTE: Allow access but disable PHP script execution
     <Directory "%(proot)s/download">
         RemoveType .php .phtml
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
     <Directory "%(proot)s/html/stats">
         RemoveType .php .phtml
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
     <Directory "%(proot)s/html/user_profile">
         RemoveType .php .phtml
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
 
     # NOTE: Allow access and allow PHP script execution
     <Directory "%(proot)s/html">
         Options Indexes MultiViews
         AllowOverride AuthConfig
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
 
     # NOTE: Allow access and allow CGI execution
     <Directory "%(proot)s/cgi-bin">
         Options ExecCGI
         AllowOverride AuthConfig
-        Order allow,deny
-        Allow from all
+        Require all granted
     </Directory>
 
 ''' %locals()