From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 25 Jul 2008 21:24:52 +0000 (-0400)
Subject: add getconfig for inline
X-Git-Tag: 2.60~228
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bf6198baf3d8ca546ff2c6651f78152f3578792a;p=ikiwiki.git

add getconfig for inline

Also, moved the pingurl getopt parsing to inline.
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2f0901943..3ca4fccdf 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -15,6 +15,7 @@ my $nested=0;
 
 sub import { #{{{
 	hook(type => "getopt", id => "inline", call => \&getopt);
+	hook(type => "getsetup", id => "inline", call => \&getsetup);
 	hook(type => "checkconfig", id => "inline", call => \&checkconfig);
 	hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
 	hook(type => "preprocess", id => "inline", 
@@ -39,8 +40,51 @@ sub getopt () { #{{{
 		"atom!" => \$config{atom},
 		"allowrss!" => \$config{allowrss},
 		"allowatom!" => \$config{allowatom},
+		"pingurl=s" => sub {
+			push @{$config{pingurl}}, $_[1];
+		},      
 	);
-}
+} #}}}
+
+sub getsetup () { #{{{
+	return
+		rss => {
+			type => "boolean",
+			default => 0,
+			description => "enable rss feeds by default",
+			safe => 1,
+			rebuild => 1,
+		},
+		atom => {
+			type => "boolean",
+			default => 0,
+			description => "enable atom feeds by default",
+			safe => 1,
+			rebuild => 1,
+		},
+		allowrss => {
+			type => "boolean",
+			default => 0,
+			description => "allow rss feeds to be used",
+			safe => 1,
+			rebuild => 1,
+		},
+		allowatom => {
+			type => "boolean",
+			default => 0,
+			description => "allow atom feeds to be used",
+			safe => 1,
+			rebuild => 1,
+		},
+		pingurl => {
+			type => "string",
+			default => "",
+			example => "http://rpc.technorati.com/rpc/ping",
+			description => "urls to ping (using XMP-RPC) on feed update",
+			safe => 1,
+			rebuild => 0,
+		},
+} #}}}
 
 sub checkconfig () { #{{{
 	if (($config{rss} || $config{atom}) && ! length $config{url}) {
diff --git a/ikiwiki.in b/ikiwiki.in
index 3bb881c43..f48f2cfeb 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -73,9 +73,6 @@ sub getconfig () { #{{{
 			"disable-plugin=s@" => sub {
 				push @{$config{disable_plugins}}, $_[1];
 			},
-			"pingurl=s" => sub {
-				push @{$config{pingurl}}, $_[1];
-			},
 			"set=s" => sub {
 				my ($var, $val)=split('=', $_[1], 2);
 				if (! defined $var || ! defined $val) {