diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2013-08-03 09:55:54 -0400 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2013-08-03 09:55:54 -0400 |
| commit | d844a3487ed03fc35eecd89c6924c5e5ad36b4c5 (patch) | |
| tree | 96e1fb55d8465f64721ff28a1802c9f788e35ebc | |
| parent | 61f4dbb8bec4c39a4c48aa67493e34205a3f3b06 (diff) | |
| download | ikiwiki-d844a3487ed03fc35eecd89c6924c5e5ad36b4c5.tar ikiwiki-d844a3487ed03fc35eecd89c6924c5e5ad36b4c5.tar.gz | |
cookiejar is now a core config setting.
| -rw-r--r-- | IkiWiki.pm | 8 | ||||
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 9 |
2 files changed, 8 insertions, 9 deletions
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. |