web commit by VictorMoral

[ikiwiki.git] / ikiwiki.pl

diff --git a/ikiwiki.pl b/ikiwiki.pl
index b4cf0e64a959e57e88b862a00f85c5625e4b24d9..6204ff194a0bc9392597f1f5429aa7abbaf5c420 100755 (executable)
--- 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]/;
                        },
@@ -72,7 +73,7 @@ sub getconfig () { #{{{
                                push @{$config{pingurl}}, $_[1];
                        },
                        "version" => sub {
-                               print "ikiwiki version $version\n";
+                               print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
                ) || usage();