From bbc7ddef2fc61997635e3a3f9895dcdaf382c054 Mon Sep 17 00:00:00 2001
From: Florian Schlichting <fsfs@debian.org>
Date: Thu, 31 Dec 2015 17:32:48 +0100
Subject: [PATCH] Apache 2.4 removed Order / Allow directives for new Require

---
 config/apache-davical.conf | 7 +++++--
 htdocs/.gitignore          | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 htdocs/.gitignore

diff --git a/config/apache-davical.conf b/config/apache-davical.conf
index ec84c2d0..d9a898ce 100644
--- a/config/apache-davical.conf
+++ b/config/apache-davical.conf
@@ -5,8 +5,11 @@ Alias /davical /usr/share/davical/htdocs
 <Directory /usr/share/davical/htdocs>
   DirectoryIndex index.php index.html
   AllowOverride None
-  Order allow,deny
-  Allow from all
+  # for Apache from 2.4 use
+  Require all granted
+  # for Apache before 2.4 use
+  #Order allow,deny
+  #Allow from all
   AcceptPathInfo On
   php_value include_path /usr/share/php/awl/inc
   php_value magic_quotes_gpc 0
diff --git a/htdocs/.gitignore b/htdocs/.gitignore
deleted file mode 100644
index d8267307..00000000
--- a/htdocs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-andrew@catalyst.net.nz.freebusy