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 ++++---
 config/ikiwiki_da_admin.setup.in | 45 ----------------------------------------
 2 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 config/ikiwiki_da_admin.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
diff --git a/config/ikiwiki_da_admin.setup.in b/config/ikiwiki_da_admin.setup.in
deleted file mode 100644
index e39066f..0000000
--- a/config/ikiwiki_da_admin.setup.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# IkiWiki::Setup::Yaml - YAML formatted setup file
-wikiname: Birgit Maanestraale
-adminemail: siri@jones.dk
-adminuser:
-- birgit
-- siri
-- jonas
-destdir: '@CURDIR@/build/html-admin'
-url: http://admin.birgitmaanestraale.dk/
-cgiurl: http://admin.birgitmaanestraale.dk/ikiwiki.cgi
-cgi_wrapper: '@CURDIR@/build/cgi-admin/ikiwiki.cgi'
-add_plugins:
-- lockedit
-- branding
-- topbar
-- sidebar
-- farbar
-- footer
-- copyright
-- linkmap
-- attachment
-- httpauth
-disable_plugins:
-- passwordauth
-- openid
-discussion: 0
-html5: 0
-timeformat: '%A d. %e. %B'
-locale: da_DK.UTF-8
-hardlink: 1
-timezone: Europe/Copenhagen
-allow_symlinks_before_srcdir: 1
-git_wrapper: '@CURDIR@/build/git-admin/post-update-ikiwiki-admin'
-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
-wikistatedir: '@CURDIR@/.ikiwiki-admin'
-- 
cgit v1.2.3