From 9e7ab098feb357a5d254bf8752835ac02aa107bf Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 20 Apr 2017 14:11:47 +0200
Subject: Merge snippets local-ikiwiki local-ikiwiki-multilang, and move to
 config-available.

---
 apache2/conf-available/local-ikiwiki.conf   | 9 +++++++++
 apache2/conf.d/local-ikiwiki-multilang.conf | 7 -------
 apache2/conf.d/local-ikiwiki.conf           | 8 --------
 3 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100644 apache2/conf-available/local-ikiwiki.conf
 delete mode 100644 apache2/conf.d/local-ikiwiki-multilang.conf
 delete mode 100644 apache2/conf.d/local-ikiwiki.conf

diff --git a/apache2/conf-available/local-ikiwiki.conf b/apache2/conf-available/local-ikiwiki.conf
new file mode 100644
index 0000000..cbc0a07
--- /dev/null
+++ b/apache2/conf-available/local-ikiwiki.conf
@@ -0,0 +1,9 @@
+<Location />
+	Options MultiViews
+	DirectoryIndex index
+</Location>
+AddLanguage da .da
+
+AddDefaultCharset utf-8
+
+Alias /ikiwiki/openid/jquery.js /usr/share/javascript/jquery/jquery.min.js
diff --git a/apache2/conf.d/local-ikiwiki-multilang.conf b/apache2/conf.d/local-ikiwiki-multilang.conf
deleted file mode 100644
index 4bba25e..0000000
--- a/apache2/conf.d/local-ikiwiki-multilang.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<Location />
-	Options MultiViews
-	DirectoryIndex index
-</Location>
-AddLanguage da .da
-
-AddDefaultCharset utf-8
diff --git a/apache2/conf.d/local-ikiwiki.conf b/apache2/conf.d/local-ikiwiki.conf
deleted file mode 100644
index cd23d64..0000000
--- a/apache2/conf.d/local-ikiwiki.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-<Location />
-	Options None
-	DirectoryIndex index.html
-</Location>
-
-AddDefaultCharset utf-8
-
-Alias /ikiwiki/openid/jquery.js /usr/share/javascript/jquery/jquery.min.js
-- 
cgit v1.2.3