Prepare for restructuring: Add YAML in-file, replacing include.mk.

3 files changed, 51 insertions, 283 deletions

diff --git a/config/ikiwiki.setup b/config/ikiwiki.setup
deleted file mode 100644
index 44b1eee..0000000
--- a/config/ikiwiki.setup
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/usr/bin/perl
-# Setup file for ikiwiki.
-#
-# Passing this to ikiwiki --setup will make ikiwiki generate
-# wrappers and build the wiki.
-#
-# Remember to re-run ikiwiki --setup any time you edit this file.
-
-our ($basedir, $shareddir, $builddir, $domain, $gitrepo);
-BEGIN {
-	# git hook requires full path as basedir: $ENV{'HOME'} . '/mywiki'
-	$basedir = '/home/jonas/src/private_webdata/jones.new';
-	$shareddir = $ENV{'SHAREDDIR'} || $basedir . '/shared';
-	$builddir = $ENV{'BUILDDIR'} || $basedir . '/build';
-	$domain = 'jones.dk';
-	$gitrepo = 'jones/content';
-}
-
-use IkiWiki::Setup::Standard {
-	# name of the wiki
-	wikiname => 'IT-guide dr. Jones',
-	# contact email for wiki
-	adminemail => 'dr@' . $domain,
-	# users who are wiki admins
-	adminuser => [qw{
-		http://dr.jones.dk/
-		http://sirireiter.dk/
-		}],
-	# users who are banned from the wiki
-	banned_users => [],
-	# where the source of the wiki is located
-	srcdir => $basedir . '/content',
-	# where to build the wiki
-	destdir => $builddir . '/html',
-	# base url to the wiki
-	url => 'http://dr.' . $domain . '/',
-	# url to the ikiwiki.cgi
-	cgiurl => 'http://dr.' . $domain . '/ikiwiki.cgi',
-	# cgi wrapper to generate
-	cgi_wrapper => $builddir . '/cgi/ikiwiki.cgi',
-	# mode for cgi_wrapper (can safely be made suid)
-	cgi_wrappermode => '00755',
-	# rcs backend to use
-	rcs => 'git',
-	# plugins to add to the default configuration
-	add_plugins => [qw{
-		h1title
-		goodstuff search typography topbar sidebar farbar favicon varioki copyright license po lockedit wmd
-		map linkmap aggregate html graphviz
-		}],
-	# plugins to disable
-	disable_plugins => [qw{
-		htmlscrubber passwordauth
-		}],
-	# location of template files
-	templatedir => $shareddir . '/templates',
-	# base wiki source location
-	underlaydirbase => $shareddir,
-	underlaydirs => [
-		$basedir . '/styling',
-		$basedir . '/wmd',
-		],
-	underlaydir => $shareddir . '/basewiki',
-	# display verbose messages when building?
-	#verbose => 1,
-	# log to syslog?
-	#syslog => 1,
-	# create output files named page/index.html?
-	usedirs => 1,
-	# use '!'-prefixed preprocessor directives?
-	prefix_directives => 1,
-	# use page/index.mdwn source files
-	indexpages => 0,
-	# enable Discussion pages?
-	discussion => 1,
-	# only send cookies over SSL connections?
-	sslcookie => 0,
-	# extension to use for new pages
-	default_pageext => 'mdwn',
-	# extension to use for html files
-	htmlext => 'html',
-	# strftime format string to display date
-#	timeformat => '%A, %B %e, %Y, at %r (danish time)',
-	# UTF-8 locale to use
-#	locale => 'en_US.UTF-8',
-	# put user pages below specified page
-	userdir => '',
-	# how many backlinks to show before hiding excess (0 to show all)
-	numbacklinks => 10,
-	# attempt to hardlink source files? (optimisation for large files)
-	hardlink => 1,
-	# force ikiwiki to use a particular umask
-	#umask => 022,
-	# extra library and plugin directory
-	libdir => $shareddir . '/perl',
-	# environment variables
-	ENV => {},
-	# regexp of source files to ignore
-	#exclude => '\\.wav$',
-	# specifies the characters that are allowed in source filenames
-	wiki_file_chars => '-[:alnum:]+/.:_',
-	# allow symlinks in the path leading to the srcdir (potentially insecure)
-	allow_symlinks_before_srcdir => 1,
-
-	# aggregate plugin
-	# enable aggregation to internal pages?
-	#aggregateinternal => 0,
-	# allow aggregation to be triggered via the web?
-	#aggregate_webtrigger => 0,
-
-	# amazon_s3 plugin
-	# public access key id
-	#amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
-	# file holding secret key (must not be readable by others!)
-	#amazon_s3_key_id => 's3_key',
-	# globally unique name of bucket to store wiki in
-	#amazon_s3_bucket => 'mywiki',
-	# a prefix to prepend to each page name
-	#amazon_s3_prefix => 'wiki/',
-	# which S3 datacenter to use (leave blank for default)
-	#amazon_s3_location => 'EU',
-	# store each index file twice? (allows urls ending in "/index.html" and "/")
-	#amazon_s3_dupindex => 0,
-
-	# anonok plugin
-	# PageSpec to limit which pages anonymous users can edit
-	#anonok_pagespec => '*/discussion',
-
-	# attachment plugin
-	# enhanced PageSpec specifying what attachments are allowed
-	#allowed_attachments => 'virusfree() and mimetype(image/*) and maxsize(50kb)',
-	# virus checker program (reads STDIN, returns nonzero if virus found)
-	#virus_checker => 'clamdscan -',
-
-	# calendar plugin
-	# base of the archives hierarchy
-	#archivebase => 'archives',
-
-	# git plugin
-	# git hook to generate
-	git_wrapper => $builddir . '/git/post-update-ikiwiki',
-	# mode for git_wrapper (can safely be made suid)
-	git_wrappermode => '06755',
-	# gitweb url to show file history ([[file]] substituted)
-	historyurl => 'http://source.' . $domain . '/?p=' . $gitrepo . '.git;a=history;f=[[file]]', # ;hb=master
-	# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
-	diffurl => 'http://source.' . $domain . '/?p=' . $gitrepo . '.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
-	# where to pull and push changes (set to empty string to disable)
-	gitorigin_branch => '',
-	# branch that the wiki is stored in
-	#gitmaster_branch => 'master',
-
-	# htmlscrubber plugin
-	# PageSpec specifying pages not to scrub
-	htmlscrubber_skip => '!*/Discussion',
-
-	# inline plugin
-	# enable rss feeds by default?
-	#rss => 0,
-	# enable atom feeds by default?
-	#atom => 0,
-	# allow rss feeds to be used?
-	allowrss => 1,
-	# allow atom feeds to be used?
-	allowatom => 1,
-	# urls to ping (using XML-RPC) on feed update
-	#pingurl => 'http://rpc.technorati.com/rpc/ping',
-
-	# listdirectives plugin
-	# directory in srcdir that contains directive descriptions
-	#directive_description_dir => 'ikiwiki/directive',
-
-	# lockedit plugin
-	# PageSpec controlling which pages are locked
-	locked_pages => '!*/Discussion',
-
-	# mdwn plugin
-	# enable multimarkdown features?
-	#multimarkdown => 0,
-
-	# mirrorlist plugin
-	# list of mirrors
-	#mirrorlist => {},
-
-	# openid plugin
-	# an url where users can signup for an OpenID
-	#openidsignup => 'http://myopenid.com/',
-
-	# passwordauth plugin
-	# a password that must be entered when signing up for an account
-	#account_creation_password => 's3cr1t',
-	# cost of generating a password using Authen::Passphrase::BlowfishCrypt
-	#password_cost => 8,
-
-	# pinger plugin
-	# how many seconds to try pinging before timing out
-	#pinger_timeout => 15,
-
-	# prettydate plugin
-	# format to use to display date
-	#prettydateformat => '%X, %B %o, %Y',
-
-	# recentchanges plugin
-	# name of the recentchanges page
-	#recentchangespage => 'recentchanges',
-	# number of changes to track
-	#recentchangesnum => 100,
-
-	# search plugin
-	# path to the omega cgi program
-	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
-
-	# tag plugin
-	# parent page tags are located under
-	tagbase => 'tag',
-
-	# teximg plugin
-	# Should teximg use dvipng to render, or dvips and convert?
-	#teximg_dvipng => '',
-	# LaTeX prefix for teximg plugin
-	#teximg_prefix => '\\documentclass{article}
-	#\\usepackage{amsmath}
-	#\\usepackage{amsfonts}
-	#\\usepackage{amssymb}
-	#\\pagestyle{empty}
-	#\\begin{document}
-	#',
-	# LaTeX postfix for teximg plugin
-	#teximg_postfix => '\\end{document}',
-
-	# typography plugin
-	# Text::Typography attributes value
-	typographyattributes => 'ie',
-
-	# websetup plugin
-	# list of plugins that cannot be enabled/disabled via the web interface
-	#websetup_force_plugins => [],
-	# show unsafe settings, read-only, in web interface?
-	#websetup_show_unsafe => 1,
-
-	# varioki plugin (strings are eval'ed: double-quote actual strings!)
-	varioki => {
-		'branding_logo_text' => '"dr. Jones"',
-	#	'branding_logo' => '"logo.png"',
-		'branding_logo_tagline' => '"it-guide"',
-	},
-
-	po_master_language => 'en|English',
-	po_slave_languages => [qw{
-		da|Dansk
-		}],
-	po_translatable_pages => "* and !*/talk/* and !emdebian/fb/*",
-	po_link_to => "negotiated",
-}
diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in
new file mode 100644
index 0000000..42275ff
--- /dev/null
+++ b/config/ikiwiki.setup.in
@@ -0,0 +1,51 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+wikiname: IT-guide dr. Jones
+adminemail: dr@jones.dk
+adminuser:
+- http://dr.jones.dk/
+- http://sirireiter.dk/
+url: http://dr.jones.dk/
+cgiurl: http://dr.jones.dk/ikiwiki.cgi
+add_plugins:
+- search
+- topbar
+- sidebar
+- farbar
+- copyright
+- license
+- po
+- lockedit
+- wmd
+- map
+- linkmap
+- aggregate
+- html
+- graphviz
+disable_plugins:
+- htmlscrubber
+- passwordauth
+html5: 0
+timeformat: '%c'
+locale: en_US.UTF-8
+hardlink: 1
+timezone: Europe/Copenhagen
+allow_symlinks_before_srcdir: 1
+historyurl: http://source.jones.dk/?p=jones/content.git;a=history;f=[[file]]
+diffurl: http://source.jones.dk/?p=jones/content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]
+gitorigin_branch: ''
+gitmaster_branch: master
+htmlscrubber_skip: '!*/Discussion'
+allowrss: 1
+allowatom: 1
+#anonok_pagespec: '*/discussion'
+locked_pages: '!*/Discussion'
+multimarkdown: 1
+nodiscount: 1
+po_master_language: en|English
+po_slave_languages:
+- da|Dansk
+po_translatable_pages: '* and !*/talk/* and !emdebian/fb/*'
+po_link_to: negotiated
+aggregateinternal: 1
+tagbase: tag
+tag_autocreate_commit: 1
diff --git a/config/include.mk b/config/include.mk
deleted file mode 100644
index 864ebd2..0000000
--- a/config/include.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-domain = example.com
-gitrepo = site/content
-
-plugins = goodstuff \
-
-plugins-off =
-
-admins =
-
-IKIWIKI_CONFIG_OPTIONS = \
-	--wikiname 'SampleWiki' \
-	--adminemail 'webmaster@$(domain)' \
-	$(patsubst %,--adminuser '%',$(admins)) \
-	$(patsubst %,--plugin %,$(plugins)) \
-	$(patsubst %,--disable-plugin %,$(plugins-off)) \
-
-# collaboration/aggregation
-IKIWIKI_CONFIG_OPTIONS += \
-	--allowrss \
-	--allowatom \
-
-# styling
-IKIWIKI_CONFIG_OPTIONS += \
-	
-# CGI
-IKIWIKI_CONFIG_OPTIONS += \
-
-# VCS
-IKIWIKI_CONFIG_OPTIONS += \