From be0919893d8b70b4fa6dbe8ddc250b521f450bc9 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sat, 11 Mar 2017 08:56:14 +0100
Subject: [PATCH] updating shipped .htaccess files for Apache 2.4 as per
 https://httpd.apache.org/docs/2.4/upgrading.html#access - Thanks @EchoDev,
 fixes #194

---
 .gitignore       | 1 +
 CHANGELOG.md     | 1 +
 cfg/.gitignore   | 1 -
 cfg/.htaccess    | 3 +--
 lib/.htaccess    | 3 +--
 tpl/.htaccess    | 1 +
 vendor/.htaccess | 1 +
 7 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 cfg/.gitignore
 create mode 100644 tpl/.htaccess
 create mode 100644 vendor/.htaccess

diff --git a/.gitignore b/.gitignore
index e476e38..9f09f53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Ignore server files for safety
 .htaccess
 .htpasswd
+cfg/conf.ini
 
 # Ignore data/
 data/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10fab74..964d4ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
     * ADDED: Translations for Spanish, Occitan, Norwegian and Portuguese
     * ADDED: Option in configuration to change the default "PrivateBin" title of the site
     * CHANGED: Minimum required PHP version is 5.4 (#186)
+    * CHANGED: Shipped .htaccess files were updated for Apache 2.4 (#192)
     * CHANGED: Cleanup of bootstrap template variants and moved icons to `img` directory
   * **1.1 (2016-12-26)**
     * ADDED: Translations for Italian and Russian
diff --git a/cfg/.gitignore b/cfg/.gitignore
deleted file mode 100644
index 69db020..0000000
--- a/cfg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/conf.ini
diff --git a/cfg/.htaccess b/cfg/.htaccess
index b584d98..b66e808 100644
--- a/cfg/.htaccess
+++ b/cfg/.htaccess
@@ -1,2 +1 @@
-Allow from none
-Deny from all
+Require all denied
diff --git a/lib/.htaccess b/lib/.htaccess
index b584d98..b66e808 100644
--- a/lib/.htaccess
+++ b/lib/.htaccess
@@ -1,2 +1 @@
-Allow from none
-Deny from all
+Require all denied
diff --git a/tpl/.htaccess b/tpl/.htaccess
new file mode 100644
index 0000000..b66e808
--- /dev/null
+++ b/tpl/.htaccess
@@ -0,0 +1 @@
+Require all denied
diff --git a/vendor/.htaccess b/vendor/.htaccess
new file mode 100644
index 0000000..b66e808
--- /dev/null
+++ b/vendor/.htaccess
@@ -0,0 +1 @@
+Require all denied