More my thoughts about making a secure public wiki -- perhaps someone will find them...

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e6efe18891069f128ff19ab87de717218b0a8797..6233d2eada36e376ccacbc3abe140598cf9004e4 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -157,6 +157,13 @@ sub getsetup () {
                safe => 0, # path
                rebuild => 0,
        },
                safe => 0, # path
                rebuild => 0,
        },

+       underlaydirbase => {
+               type => "internal",
+               default => "$installdir/share/ikiwiki",
+               description => "parent directory containing additional underlays",
+               safe => 0,
+               rebuild => 0,
+       },

        wrappers => {
                type => "internal",
                default => [],
        wrappers => {
                type => "internal",
                default => [],


@@ -715,7 +722,7 @@ sub add_underlay ($) {
        my $dir=shift;
 
        if ($dir !~ /^\//) {
        my $dir=shift;
 
        if ($dir !~ /^\//) {

-               $dir="$config{underlaydir}/../$dir";
+               $dir="$config{underlaydirbase}/$dir";

        }
 
        if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {
        }
 
        if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {