add submodules wiki/, ikiwiki/

[sipb-www.git] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index ae13b750f50df2c6851ee79c445ce06fac2cfa5e..c31344c67584273316d14cce964834d21709e3c2 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -19,9 +19,9 @@ use IkiWiki::Setup::Standard {
        # where to build the wiki
        destdir => '/afs/sipb.mit.edu/project/sipb-www/web_scripts/wiki/',
        # base url to the wiki
-       url => 'http://sipb.mit.edu/wiki',
+       url => 'http://sipb.mit.edu/',
        # url to the ikiwiki.cgi
-       cgiurl => 'https://sipb.mit.edu:444/wiki/ikiwiki.cgi',
+       cgiurl => 'https://sipb.mit.edu:444/ikiwiki.cgi',
        # filename of cgi wrapper to generate
        cgi_wrapper => '/afs/sipb.mit.edu/project/sipb-www/web_scripts/wiki/ikiwiki.cgi',
        # mode for cgi_wrapper (can safely be made suid)
@@ -29,9 +29,14 @@ use IkiWiki::Setup::Standard {
        # rcs backend to use
        rcs => 'git',
        # plugins to add to the default configuration
-       add_plugins => [qw(goodstuff httpauth)],
+       # IMPORTANT! If you add plugins that involve interface changes, you
+       # will need to modify our templates to allow this, as our custom
+       # template does not support them yet. See ~/src/ikiwiki/templates
+       add_plugins => [qw(goodstuff html httpauth)],
        # plugins to disable
-       disable_plugins => [qw(smiley)],
+       # IMPORTANT! If you reenable passwordauth/openid, you need to
+       # do some modifications described in TODO.SIPB in the source-tree
+       disable_plugins => [qw(smiley passwordauth openid)],
        # location of template files
        templatedir => '/mit/sipb-www/share/ikiwiki/templates',
        # base wiki source location
@@ -47,7 +52,7 @@ use IkiWiki::Setup::Standard {
        # use page/index.mdwn source files
        indexpages => 0,
        # enable Discussion pages?
-       discussion => 1,
+       discussion => 0,
        # only send cookies over SSL connections?
        sslcookie => 0,
        # extension to use for new pages
@@ -129,7 +134,7 @@ use IkiWiki::Setup::Standard {
 
        # git plugin
        # git hook to generate
-       git_wrapper => '/mit/sipb-www/ikiwiki/src/.git/hooks/post-update',
+       git_wrapper => '/mit/sipb-www/wiki.git/hooks/post-update',
        # mode for git_wrapper (can safely be made suid)
        #git_wrappermode => '06755',
        # git pre-receive hook to generate