X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/85f4b99710fa94b9b67cee061c37eaf49be36b25..6d445cdacabc15e8966912fd2ce6794863d64b8a:/ikiwiki.in?ds=sidebyside diff --git a/ikiwiki.in b/ikiwiki.in index d601d2739..d2f5d48dc 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -119,16 +119,6 @@ sub getconfig () { #{{{ } delete $ENV{WRAPPED_OPTIONS}; - if ($config{post_commit} && ! commit_hook_enabled()) { - # optimisation for no-op post_commit - exit 0; - } - elsif ($config{test_receive}) { - # quick success if the user is trusted - require IkiWiki::Receive; - exit 0 if IkiWiki::Receive::trusted(); - } - loadplugins(); checkconfig(); } @@ -166,13 +156,14 @@ sub main () { #{{{ } # setup implies a wiki rebuild by default - if (! $config{refresh}) { + if (! $config{refresh} && ! $config{render}) { $config{rebuild}=1; } } if ($config{dumpsetup}) { $config{srdir}=$config{destdir}=""; + $config{syslog}=1 if $config{setupsyslog}; require IkiWiki::Setup; IkiWiki::Setup::dump($config{dumpsetup}); }