From 74c5d366d7d294b3722c58b01989856811adb48d Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Mon, 19 Jun 2017 22:35:41 +0200
Subject: [PATCH] use pre-defined apache config with AllowOverride enabled to
 include htaccess files

---
 000-default.conf | 15 +++++++++++++++
 Dockerfile       |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 000-default.conf

diff --git a/000-default.conf b/000-default.conf
new file mode 100644
index 0000000..c70a3d4
--- /dev/null
+++ b/000-default.conf
@@ -0,0 +1,15 @@
+<VirtualHost *:80>
+  ServerAdmin webmaster@localhost
+  DocumentRoot /usr/share/blog/public
+
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+<Directory /usr/share/blog/public/>
+  Options Indexes FollowSymLinks Includes MultiViews
+  AllowOverride All
+  Order allow,deny
+  Allow from all
+</Directory>
+
+</VirtualHost>
diff --git a/Dockerfile b/Dockerfile
index edff027..5b5bb7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,6 @@ RUN dpkg -i /tmp/hugo.deb \
 
 COPY site/ /usr/share/blog
 
-RUN sed -i.bak "s;/var/www/html;/usr/share/blog/public;" /etc/apache2/sites-enabled/000-default.conf
+COPY 000-default.conf /etc/apache2/sites-enabled/
 
 CMD /usr/share/blog/build/build.sh /usr/share/blog/data/signatures/signatures.json && apache2-foreground