summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm7
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/websetup_eats_setupconf_and_allow__95__symlinks__95__before__95__srcdir.mdwn5
3 files changed, 13 insertions, 0 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 01798941c..81c9a92f4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -395,6 +395,13 @@ sub getsetup () { #{{{
safe => 0,
rebuild => 0,
},
+ allow_symlinks_before_srcdir => {
+ type => "string",
+ default => 0,
+ description => "allow symlinks in the path leading to the srcdir (potentially insecure)",
+ safe => 0,
+ rebuild => 0,
+ },
} #}}}
sub defaultconfig () { #{{{
diff --git a/debian/changelog b/debian/changelog
index fb1da867c..8df8e9f9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (2.64) UNRELEASED; urgency=low
specified.
* ddate: Stop clobbering timeformat when not enabled.
* progress: New plugin to generate progress bars (willu)
+ * Add allow_symlinks_before_srcdir to config so websetup doesn't eat it.
-- Joey Hess <joeyh@debian.org> Mon, 08 Sep 2008 19:21:20 -0400
diff --git a/doc/bugs/websetup_eats_setupconf_and_allow__95__symlinks__95__before__95__srcdir.mdwn b/doc/bugs/websetup_eats_setupconf_and_allow__95__symlinks__95__before__95__srcdir.mdwn
index 7feb97311..2bf03daf5 100644
--- a/doc/bugs/websetup_eats_setupconf_and_allow__95__symlinks__95__before__95__srcdir.mdwn
+++ b/doc/bugs/websetup_eats_setupconf_and_allow__95__symlinks__95__before__95__srcdir.mdwn
@@ -1,3 +1,8 @@
My web server runs in a chroot jail. This makes things interesting because the paths are slightly different depending on whether you are inside or outside the chroot.
To override an incorrectly guessed path, I set setupconf in the .setup file. I also set allow_symlinks_before_srcdir=>1. However, when I tried websetup, the setup file was correctly changed but these important settings disappeared. This seems like a bug.
+
+> I don't know what "setupconf" is. This is the first mention of it in the
+> ikiwiki source tree.
+>
+> I've fixed the `allow_symlinks_before_srcdir` issue. --[[Joey]]