]> sipb.mit.edu Git - ikiwiki.git/blobdiff - auto.setup
Merge branch 'master' into next
[ikiwiki.git] / auto.setup
index 74879dbc51047fb66db08027cf02e9f8a2c1d737..9cf5e7725ede534f1d5e16c1d7f06a8064156ed0 100644 (file)
@@ -28,7 +28,7 @@ IkiWiki::Setup::Automator->import(
        rcs => $rcs,
        srcdir => "$ENV{HOME}/$wikiname",
        destdir => "$ENV{HOME}/public_html/$wikiname",
-       repository => "$ENV{HOME}/$wikiname.$rcs",
+       repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
        dumpsetup => "$ENV{HOME}/$wikiname.setup",
        url => "http://$domain/~$ENV{USER}/$wikiname",
        cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
@@ -40,6 +40,5 @@ IkiWiki::Setup::Automator->import(
        rss => 1,
        atom => 1,
        syslog => 1,
-       prefix_directives => 1,
        hardlink => 1,
 )