From f8402ecf3d8a55d662bc991257f54857203d8f04 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 24 Jul 2024 18:14:34 +0200
Subject: rename (and merge) setup file

---
 config/ikiwiki.setup.in    | 41 ++++++++++++++++++++++++++++++++++++++++-
 config/ikiwiki_da.setup.in | 41 -----------------------------------------
 2 files changed, 40 insertions(+), 42 deletions(-)
 delete mode 100644 config/ikiwiki_da.setup.in

diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in
index ed57570..2a25be4 100644
--- a/config/ikiwiki.setup.in
+++ b/config/ikiwiki.setup.in
@@ -9,4 +9,43 @@
 # edit this file.
 #
 # name of the wiki
-wikiname: Example website
+wikiname: Birgit Maanestraale
+adminemail: siri@jones.dk
+adminuser:
+- birgit
+- siri
+- jonas
+url: https://www.birgitmaanestraale.dk/
+cgiurl: https://www.birgitmaanestraale.dk/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
+historyurl: 'https://source.couchdesign.dk/bm/content.git/log/[[file]]'
+diffurl: 'https://source.couchdesign.dk/bm/content.git/diff/[[file]]?id=[[sha1_commit]]'
+#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.setup.in b/config/ikiwiki_da.setup.in
deleted file mode 100644
index f01515e..0000000
--- a/config/ikiwiki_da.setup.in
+++ /dev/null
@@ -1,41 +0,0 @@
-# IkiWiki::Setup::Yaml - YAML formatted setup file
-wikiname: Birgit Maanestraale
-adminemail: siri@jones.dk
-adminuser:
-- birgit
-- siri
-- jonas
-url: https://www.birgitmaanestraale.dk/
-cgiurl: https://www.birgitmaanestraale.dk/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
-historyurl: 'https://source.couchdesign.dk/bm/content.git/log/[[file]]'
-diffurl: 'https://source.couchdesign.dk/bm/content.git/diff/[[file]]?id=[[sha1_commit]]'
-#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