From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Sep 2013 14:15:35 +0000 (-0400)
Subject: Fix cookiejar default setting.
X-Git-Tag: 3.20130904.1~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/df09eba2fd3a3269f52fa45eb4c92b180ae8d777?hp=1ad7ede08821b45bfed8e9ffd46515ab0c17f994

Fix cookiejar default setting.
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 75c957932..87ddb1b56 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -515,9 +515,8 @@ sub getsetup () {
 	},
 	cookiejar => {
 		type => "string",
-		default => "$ENV{HOME}/.ikiwiki/cookies",
+		default => { file => "$ENV{HOME}/.ikiwiki/cookies" },
 		description => "cookie control",
-		example => { file => "$ENV{HOME}/.ikiwiki/cookies" },
 		safe => 0, # hooks into perl module internals
 		rebuild => 0,
 	},
diff --git a/debian/changelog b/debian/changelog
index 8b62b0420..901154982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20130904.1) UNRELEASED; urgency=low
+
+  * Fix cookiejar default setting.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 04 Sep 2013 10:14:16 -0400
+
 ikiwiki (3.20130904) unstable; urgency=low
 
   * calendar: Display the popup mouseover when there is only 1 page for a