summaryrefslogtreecommitdiff
path: root/apache2/conf.d
diff options
context:
space:
mode:
authorroot <root@borneuni.dk>2008-09-22 13:24:54 +0200
committerroot <root@borneuni.dk>2008-09-22 13:24:54 +0200
commit1ffcbc50480912d52d73e02507ca416c5fac1e2c (patch)
tree60ce7ef3e222118259f9770a949c98a6fb42a888 /apache2/conf.d
parent3e72e780960dc934bcae79fbd11426f46ec3fb4c (diff)
Fork -multilang flavor from Apache2 ikiwiki snippet.
Diffstat (limited to 'apache2/conf.d')
-rw-r--r--apache2/conf.d/local-ikiwiki-multilang.conf10
-rw-r--r--apache2/conf.d/local-ikiwiki.conf8
2 files changed, 12 insertions, 6 deletions
diff --git a/apache2/conf.d/local-ikiwiki-multilang.conf b/apache2/conf.d/local-ikiwiki-multilang.conf
new file mode 100644
index 0000000..6c7b73e
--- /dev/null
+++ b/apache2/conf.d/local-ikiwiki-multilang.conf
@@ -0,0 +1,10 @@
+<Location />
+ Options -Indexes +MultiViews
+ DirectoryIndex index
+</Location>
+AddLanguage da .da
+
+AddDefaultCharset UTF-8
+
+RewriteEngine On
+RewriteRule ^((.*/)?[^\.]+)(\.html|/)$ $1.da.html [R]
diff --git a/apache2/conf.d/local-ikiwiki.conf b/apache2/conf.d/local-ikiwiki.conf
index 6c7b73e..987e434 100644
--- a/apache2/conf.d/local-ikiwiki.conf
+++ b/apache2/conf.d/local-ikiwiki.conf
@@ -1,10 +1,6 @@
<Location />
- Options -Indexes +MultiViews
- DirectoryIndex index
+ Options None
+ DirectoryIndex index.html
</Location>
-AddLanguage da .da
AddDefaultCharset UTF-8
-
-RewriteEngine On
-RewriteRule ^((.*/)?[^\.]+)(\.html|/)$ $1.da.html [R]