X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c35444826ca47123697a8f2512866f4f99964cc4..35ee7e44a62f9126a83c1243b549d47cc5ca7b43:/ikiwiki.pl diff --git a/ikiwiki.pl b/ikiwiki.pl index b4cf0e64a..60ba5e182 100755 --- a/ikiwiki.pl +++ b/ikiwiki.pl @@ -3,7 +3,6 @@ $ENV{PATH}="/usr/local/bin:/usr/bin:/bin"; delete @ENV{qw{IFS CDPATH ENV BASH_ENV}}; package IkiWiki; -our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE use warnings; use strict; @@ -34,6 +33,7 @@ sub getconfig () { #{{{ "no-rcs" => sub { $config{rcs}="" }, "anonok!" => \$config{anonok}, "rss!" => \$config{rss}, + "atom!" => \$config{atom}, "cgi!" => \$config{cgi}, "discussion!" => \$config{discussion}, "w3mmode!" => \$config{w3mmode}, @@ -47,6 +47,7 @@ sub getconfig () { #{{{ "adminemail=s" => \$config{adminemail}, "timeformat=s" => \$config{timeformat}, "sslcookie!" => \$config{sslcookie}, + "httpauth!" => \$config{httpauth}, "exclude=s@" => sub { $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/; }, @@ -68,11 +69,11 @@ sub getconfig () { #{{{ "disable-plugin=s@" => sub { $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}}]; }, - "pingurl" => sub { + "pingurl=s" => sub { push @{$config{pingurl}}, $_[1]; }, "version" => sub { - print "ikiwiki version $version\n"; + print "ikiwiki version $IkiWiki::version\n"; exit; }, ) || usage();