From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sat, 3 Aug 2013 13:55:54 +0000 (-0400)
Subject: cookiejar is now a core config setting.
X-Git-Tag: 3.20130904~72^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d844a3487ed03fc35eecd89c6924c5e5ad36b4c5?hp=61f4dbb8bec4c39a4c48aa67493e34205a3f3b06

cookiejar is now a core config setting.
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3fc0c7d8a..75c957932 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -513,6 +513,14 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	cookiejar => {
+		type => "string",
+		default => "$ENV{HOME}/.ikiwiki/cookies",
+		description => "cookie control",
+		example => { file => "$ENV{HOME}/.ikiwiki/cookies" },
+		safe => 0, # hooks into perl module internals
+		rebuild => 0,
+	},
 }
 
 sub defaultconfig () {
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index ccbc6c9a9..3e3eb6d93 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -58,21 +58,12 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 0,
 		},
-		cookiejar => {
-			type => "string",
-			example => { file => "$ENV{HOME}/.ikiwiki/cookies" },
-			safe => 0, # hooks into perl module internals
-			description => "cookie control",
-		},
 }
 
 sub checkconfig () {
 	if (! defined $config{aggregateinternal}) {
 		$config{aggregateinternal}=1;
 	}
-	if (! defined $config{cookiejar}) {
-		$config{cookiejar}={ file => "$ENV{HOME}/.ikiwiki/cookies" };
-	}
 
 	# This is done here rather than in a refresh hook because it
 	# needs to run before the wiki is locked.