cookiejar is now a core config setting.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3fc0c7d8a5a2fc01f39259c16d73a034e8657305..75c95793218384bd034914d574e63464f739fd31 100644 (file)
--- 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 ccbc6c9a9b9565640f9a70c3f089102418f8910e..3e3eb6d9301da377b6a72128cde42f25a41da34c 100644 (file)
--- 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.