diff options
author | Jonas Smedegaard <dr@jones.dk> | 2017-04-20 14:11:47 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2017-04-20 14:11:47 +0200 |
commit | 9e7ab098feb357a5d254bf8752835ac02aa107bf (patch) | |
tree | aca9b3a31e7945a6666b8c4e98278365ea99ef35 | |
parent | b474d527751656d8f33e3080c65ff9b8c2b39471 (diff) |
Merge snippets local-ikiwiki local-ikiwiki-multilang, and move to config-available.
-rw-r--r-- | apache2/conf-available/local-ikiwiki.conf (renamed from apache2/conf.d/local-ikiwiki.conf) | 5 | ||||
-rw-r--r-- | apache2/conf.d/local-ikiwiki-multilang.conf | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/apache2/conf.d/local-ikiwiki.conf b/apache2/conf-available/local-ikiwiki.conf index cd23d64..cbc0a07 100644 --- a/apache2/conf.d/local-ikiwiki.conf +++ b/apache2/conf-available/local-ikiwiki.conf @@ -1,7 +1,8 @@ <Location /> - Options None - DirectoryIndex index.html + Options MultiViews + DirectoryIndex index </Location> +AddLanguage da .da AddDefaultCharset utf-8 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 |