Link in the 2015 Christmas Puzzle Hunt

[cworth.org] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 35ee940aca239cd4a55387bb7b43c44a2446d6dc..801cf20fa00d4b9f608b957ca03cbd4cd390e998 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -5,18 +5,25 @@
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
+our ($gitrepo, $checkout);
+
+BEGIN {
+       $gitrepo = '/home/srv/cworth.org/wiki';
+       $checkout = "$gitrepo/ikiwiki-checkout";
+}
+
 use IkiWiki::Setup::Standard {
-       wikiname => "cworth.org",
+       wikiname => "Carl's boring web pages",
        #adminuser => ["yourname", ],
        adminemail => 'cworth@cworth.org',
 
        # Be sure to customise these..
-       srcdir => "/srv/cworth.org/wiki/checkout/src",
-       destdir => "/srv/cworth.org/www",
+       srcdir => "$checkout/src",
+       destdir => "/home/srv/cworth.org/www",
 
        url => "http://cworth.org",
        #cgiurl => "http://example.org/ikiwiki.cgi",
-       templatedir => "/srv/cworth.org/wiki/checkout/templates",
+       templatedir => "$checkout/templates",
        underlaydir => "/dev/null",
 
        # Git stuff.
@@ -38,7 +45,7 @@ use IkiWiki::Setup::Standard {
                        # Note that this will overwrite any existing
                        # post-update hook script, which may not be
                        # what you want.
-                       wrapper => "/srv/cworth.org/wiki/hooks/ikiwiki-post-update",
+                       wrapper => "$gitrepo/hooks/ikiwiki-post-update",
                        wrappermode => "04755",
                        # Enable mail notifications of commits.
                        #notify => 1,
@@ -63,7 +70,7 @@ use IkiWiki::Setup::Standard {
        # Only send cookies over SSL connections.
        #sslcookie => 1,
        # Logging settings:
-       verbose => 0,
+       # verbose => 0,
        syslog => 0,
        # To link to user pages in a subdirectory of the wiki.
        #userdir => "users",
@@ -75,10 +82,10 @@ use IkiWiki::Setup::Standard {
        # To add plugins, list them here.
        #add_plugins => [qw{goodstuff search wikitext camelcase
        #                   htmltidy fortune sidebar map rst anonok}],
-       add_plugins => [qw{goodstuff}],
+       add_plugins => [qw{goodstuff pagetemplate rawhtml}],
        # If you want to disable any of the default plugins, list them here.
        #disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-       disable_plugins => [qw{smiley}],
+       disable_plugins => [qw{smiley htmlscrubber}],
 
        # For use with the tag plugin, make all tags be located under a
        # base page.