From ce1b51ea98a42e679fc15c773b6ec98a1a83d761 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 8 Nov 2017 13:40:54 +0100
Subject: Merge admin site into regular site.

---
 config/ikiwiki_da.setup.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'config/ikiwiki_da.setup.in')

diff --git a/config/ikiwiki_da.setup.in b/config/ikiwiki_da.setup.in
index bd40517..66fb332 100644
--- a/config/ikiwiki_da.setup.in
+++ b/config/ikiwiki_da.setup.in
@@ -16,11 +16,11 @@ add_plugins:
 - footer
 - copyright
 - linkmap
+- attachment
+- httpauth
 disable_plugins:
-- editpage
-- openid
-- recentchanges
 - passwordauth
+- openid
 discussion: 0
 html5: 0
 timeformat: '%A d. %e. %B'
@@ -28,12 +28,14 @@ locale: da_DK.UTF-8
 hardlink: 1
 timezone: Europe/Copenhagen
 allow_symlinks_before_srcdir: 1
+historyurl: 'http://source.sirireiter.dk/?p=bm/content.git;a=history;f=[[file]]'
 diffurl: http://source.sirireiter.dk/?p=bm/content.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]
 #gitorigin_branch: ''
 gitmaster_branch: master
 htmlscrubber_skip: '*'
 locked_pages: '*'
 multimarkdown: 1
+allowed_attachments: maxsize(2mb) and (*.png or *.gif or *.jpg or *.pdf)
 typographyattributes: ie
 tagbase: tag
 tag_autocreate_commit: 1
-- 
cgit v1.2.3