Web setup

diff --git a/wiki.conf b/web.setup
similarity index 86%
rename from wiki.conf
rename to web.setup
index 638a96f..e132533 100644 (file)
--- a/wiki.conf
+++ b/web.setup
@@ -12,25 +12,25 @@ use IkiWiki::Setup::Standard {
        # contact email for wiki
        adminemail => 'moonshot-community@jiscmail.ac.uk',
        # users who are wiki admins
-       adminuser => [],
+       adminuser => [qw{hartmans josh}],
        # users who are banned from the wiki
        banned_users => [],
        # where the source of the wiki is located
-       srcdir => '.',
+       srcdir => '/srv/devwiki/src',
        # where to build the wiki
-       destdir => '../wiki-out',
+       destdir => '/srv/devwiki/out',
        # base url to the wiki
-       url => '',
+       url => 'http://www.project-moonshot.org/devwiki/',
        # url to the ikiwiki.cgi
-       cgiurl => '',
+       cgiurl => 'http://www.project-moonshot.org/devwiki/cgi',
        # filename of cgi wrapper to generate
-       cgi_wrapper => '',
+       cgi_wrapper => '/srv/devwiki/ikiwiki.cgi',
        # mode for cgi_wrapper (can safely be made suid)
        cgi_wrappermode => '06755',
        # rcs backend to use
        rcs => 'git',
        # plugins to add to the default configuration
-       add_plugins => ['toc'],
+       add_plugins => [qw{toc goodstuff websetup}],
        # plugins to disable
        disable_plugins => [],
        # additional directory to search for template files
@@ -40,7 +40,7 @@ use IkiWiki::Setup::Standard {
        # display verbose messages?
        #verbose => 1,
        # log to syslog?
-       #syslog => 1,
+       syslog => 1,
        # create output files named page/index.html?
        usedirs => 1,
        # use '!'-prefixed preprocessor directives?
@@ -88,9 +88,29 @@ use IkiWiki::Setup::Standard {
 
        ######################################################################
        # core plugins
-       #   (editpage, htmlscrubber, inline, link, meta, parentlinks)
+       #   (editpage, git, htmlscrubber, inline, link, meta, parentlinks)
        ######################################################################
 
+       # git plugin
+       # git hook to generate
+       git_wrapper => '/srv/git/devwiki.git/hooks/post-update',
+       # shell command for git_wrapper to run, in the background
+       #git_wrapper_background_command => 'git push github',
+       # mode for git_wrapper (can safely be made suid)
+       #git_wrappermode => '06755',
+       # git pre-receive hook to generate
+       #git_test_receive_wrapper => '/git/wiki.git/hooks/pre-receive',
+       # unix users whose commits should be checked by the pre-receive hook
+       #untrusted_committers => [],
+       # gitweb url to show file history ([[file]] substituted)
+       historyurl => 'http://www.project-moonshot.org/gitweb?p=devwiki.git;a=history;f=[[file]];hb=HEAD',
+       # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
+       diffurl => 'http://www.project-moonshot.org/gitweb?p=devwiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]',
+       # where to pull and push changes (set to empty string to disable)
+       gitorigin_branch => 'origin',
+       # branch that the wiki is stored in
+       gitmaster_branch => 'master',
+
        # htmlscrubber plugin
        # PageSpec specifying pages not to scrub
        #htmlscrubber_skip => '!*/Discussion',
@@ -99,7 +119,7 @@ use IkiWiki::Setup::Standard {
        # enable rss feeds by default?
        #rss => 0,
        # enable atom feeds by default?
-         atom => 1,
+       atom => 1,
        # allow rss feeds to be used?
        #allowrss => 0,
        # allow atom feeds to be used?
@@ -222,7 +242,7 @@ use IkiWiki::Setup::Standard {
        # list of additional setup field keys to treat as unsafe
        #websetup_unsafe => [],
        # show unsafe settings, read-only, in web interface?
-       #websetup_show_unsafe => 1,
+       websetup_show_unsafe => 1,
 
        ######################################################################
        # widget plugins