summaryrefslogtreecommitdiff
path: root/apache2/conf-available
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-20 14:13:49 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-20 14:13:49 +0200
commitb2c2ad1e800d442e98d2078741d709a7864d0b51 (patch)
treef54c0d382fc7aebb5186b5213dd4eba067b2f58a /apache2/conf-available
parent9e7ab098feb357a5d254bf8752835ac02aa107bf (diff)
Partly revert: re-introduce snippet local-ikiwiki-multilang.
Diffstat (limited to 'apache2/conf-available')
-rw-r--r--apache2/conf-available/local-ikiwiki-multilang.conf9
-rw-r--r--apache2/conf-available/local-ikiwiki.conf5
2 files changed, 11 insertions, 3 deletions
diff --git a/apache2/conf-available/local-ikiwiki-multilang.conf b/apache2/conf-available/local-ikiwiki-multilang.conf
new file mode 100644
index 0000000..cbc0a07
--- /dev/null
+++ b/apache2/conf-available/local-ikiwiki-multilang.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-available/local-ikiwiki.conf b/apache2/conf-available/local-ikiwiki.conf
index cbc0a07..cd23d64 100644
--- a/apache2/conf-available/local-ikiwiki.conf
+++ b/apache2/conf-available/local-ikiwiki.conf
@@ -1,8 +1,7 @@
<Location />
- Options MultiViews
- DirectoryIndex index
+ Options None
+ DirectoryIndex index.html
</Location>
-AddLanguage da .da
AddDefaultCharset utf-8