From 84f00126e1dbf48ca3db4c7dfd1f8ce944783c15 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Mon, 2 May 2016 12:19:24 +0100
Subject: [PATCH] Upgrade apache config for 2.4 support

---
 templates/vhost.conf.erb | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
index 7f3cea7..feb3e1c 100644
--- a/templates/vhost.conf.erb
+++ b/templates/vhost.conf.erb
@@ -12,8 +12,7 @@
      <Directory "<%= @install_dir %>/htdocs<%= @base_path %>">
              AllowOverride None
              Options +FollowSymLinks
-             Order Allow,Deny
-             Allow from All
+             Require all granted
  
 <%- if @auth_type == 'authldap' && @use_sso -%>
              AuthType Basic
@@ -37,24 +36,19 @@
  
      # Explicitly deny access to all code and configuration directories
      <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc">
-             Order Deny,Allow
-             Deny from all
+        Require all denied
      </Directory>
  
      <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc/lang">
-             Order Deny,Allow
-             Deny from all
+        Require all denied
      </Directory>
  
      <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/lib/_fla">
-             ## no access to the fla directory
-             Order allow,deny
-             Deny from all
+        Require all denied
      </Directory>
  
      <Directory /etc/dokuwiki>
-             Order Deny,Allow
-             Deny from all
+        Require all denied
      </Directory>
  
  </VirtualHost>