Customize config.

2 files changed, 28 insertions, 98 deletions

diff --git a/Makefile b/Makefile
index 2399e70..4b8b586 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SOURCES = ikiwiki
+SOURCES = ikiwiki hearth
 
 ikiwiki_VERSION = 2.62.1
 # Git origin (with capital MOULE replaced or stripped as needed)
@@ -16,6 +16,10 @@ ikiwiki_MODULES = templates basewiki smiley directives
 #ikiwiki_POMODULES = basewiki smiley directives
 #ikiwiki_POLOCALES = da
 
+hearth_ORIGIN = git://source.jones.dk/hearth_MODULE
+hearth_BRANCH = master-FLAVOR-LOCALE
+hearth_MODULES = content
+
 #dummy_MODULES = content_dummy
 
 # uncomment this when ikiwiki.setup is configured for the local environment
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 5721896..eea6461 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -7,35 +7,39 @@
 # Remember to re-run ikiwiki --setup any time you edit this file.
 use IkiWiki::Setup::Standard {
 	# name of the wiki
-	wikiname => 'MyWiki',
+	wikiname => 'hello!earth',
 	# contact email for wiki
-	#adminemail => 'me@example.org',
+	adminemail => 'webmaster@biks.dk',
 	# users who are wiki admins
 	adminuser => [],
 	# users who are banned from the wiki
 	banned_users => [],
 	# where the source of the wiki is located
-	srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content',
+	srcdir => $ENV{'HOME'} . '/public_webdata/hearth/content',
 	# where to build the wiki
-	destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org',
+	destdir => $ENV{'HOME'} . '/public_websites/helloearth.biks.dk',
 	# base url to the wiki
-	url => 'http://wiki.example.org',
+	url => 'http://helloearth.biks.dk',
 	# url to the ikiwiki.cgi
-	cgiurl => 'http://wiki.example.org/ikiwiki.cgi',
+	cgiurl => 'http://helloearth.biks.dk/ikiwiki.cgi',
 	# cgi wrapper to generate
-	cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.cgi',
+	cgi_wrapper => $ENV{'HOME'} . '/public_cgi/helloearth.biks.dk/ikiwiki.cgi',
 	# mode for cgi_wrapper (can safely be made suid)
-	cgi_wrappermode => '06755',
+	cgi_wrappermode => '00755',
 	# rcs backend to use
-	rcs => '',
+	rcs => 'git',
 	# plugins to add to the default configuration
-	add_plugins => [],
+	add_plugins => [qw{
+		goodstuff search topbar sidebar favicon pinger
+		}],
 	# plugins to disable
-	disable_plugins => [],
+	disable_plugins => [qw{
+		passwordauth
+		}],
 	# location of template files
-	templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates',
+	templatedir => $ENV{'HOME'} . '/public_webdata/hearth/templates',
 	# base wiki source location
-	underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki',
+	underlaydir => $ENV{'HOME'} . '/public_webdata/hearth/basewiki',
 	# display verbose messages when building?
 	#verbose => 1,
 	# log to syslog?
@@ -43,7 +47,7 @@ use IkiWiki::Setup::Standard {
 	# create output files named page/index.html?
 	usedirs => 1,
 	# use '!'-prefixed preprocessor directives?
-	prefix_directives => 0,
+	prefix_directives => 1,
 	# use page/index.mdwn source files
 	indexpages => 0,
 	# enable Discussion pages?
@@ -67,7 +71,7 @@ use IkiWiki::Setup::Standard {
 	# force ikiwiki to use a particular umask
 	#umask => 022,
 	# extra library and plugin directory
-	libdir => $ENV{'HOME'} . '/private_webdata/samplewiki/perl',
+	libdir => $ENV{'HOME'} . '/public_webdata/hearth/perl',
 	# environment variables
 	ENV => {},
 	# regexp of source files to ignore
@@ -83,20 +87,6 @@ use IkiWiki::Setup::Standard {
 	# 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 => $ENV{'HOME'} . '/secret_webdata/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',
@@ -107,29 +97,19 @@ use IkiWiki::Setup::Standard {
 	# virus checker program (reads STDIN, returns nonzero if virus found)
 	#virus_checker => 'clamdscan -',
 
-	# bzr plugin
-	# bzr post-commit hook to generate
-	#bzr_wrapper => '',
-	# mode for bzr_wrapper (can safely be made suid)
-	#bzr_wrappermode => '06755',
-	# url to show file history, using loggerhead ([[file]] substituted)
-	#historyurl => '',
-	# url to view a diff, using loggerhead ([[file]] and [[r2]] substituted)
-	#diffurl => 'http://example.org/revision?start_revid=[[r2]]#[[file]]-s',
-
 	# calendar plugin
 	# base of the archives hierarchy
 	#archivebase => 'archives',
 
 	# git plugin
 	# git hook to generate
-	#git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki',
+	git_wrapper => $ENV{'HOME'} . '/public_websites/source.jones.dk/hearth_content.git/hooks/post-update-ikiwiki',
 	# mode for git_wrapper (can safely be made suid)
-	#git_wrappermode => '06755',
+	git_wrappermode => '06755',
 	# gitweb url to show file history ([[file]] substituted)
-	#historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+	historyurl => 'http://source.jones.dk/?p=hearth_content.git;a=history;f=[[file]]', # ;hb=master
 	# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
-	#diffurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+	diffurl => 'http://source.jones.dk/?p=hearth_content.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 => 'samplewiki',
 	# branch that the wiki is stored in
@@ -163,16 +143,6 @@ use IkiWiki::Setup::Standard {
 	# enable multimarkdown features?
 	#multimarkdown => 0,
 
-	# mercurial plugin
-	# mercurial post-commit hook to generate
-	#mercurial_wrapper => '',
-	# mode for mercurial_wrapper (can safely be made suid)
-	#mercurial_wrappermode => '06755',
-	# url to hg serve'd repository, to show file history ([[file]] substituted)
-	#historyurl => 'http://example.org:8000/log/tip/[[file]]',
-	# url to hg serve'd repository, to show diff ([[file]] and [[r2]] substituted)
-	#diffurl => 'http://localhost:8000/?fd=[[r2]];file=[[file]]',
-
 	# mirrorlist plugin
 	# list of mirrors
 	#mirrorlist => {},
@@ -205,55 +175,11 @@ use IkiWiki::Setup::Standard {
 	# path to the omega cgi program
 	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
 
-	# svn plugin
-	# subversion repository location
-	#svnrepo => '/svn/wiki',
-	# path inside repository where the wiki is located
-	#svnpath => 'trunk',
-	# svn post-commit hook to generate
-	#svn_wrapper => '/svn/wikirepo/hooks/post-commit',
-	# mode for svn_wrapper (can safely be made suid)
-	#svn_wrappermode => '04755',
-	# viewvc url to show file history ([[file]] substituted)
-	#historyurl => 'http://svn.example.org/trunk/[[file]]',
-	# viewvc url to show a diff ([[file]], [[r1]], and [[r2]] substituted)
-	#diffurl => 'http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]',
-
 	# 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}',
-
-	# tla plugin
-	# tla post-commit hook to generate
-	#tla_wrapper => '',
-	# mode for tla_wrapper (can safely be made suid)
-	#tla_wrappermode => '06755',
-	# url to show file history ([[file]] substituted)
-	#historyurl => '',
-	# url to show a diff ([[file]] and [[rev]] substituted)
-	#diffurl => '',
-
 	# typography plugin
 	# Text::Typography attributes value
 	#typographyattributes => '3',
-
-	# 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,
 }