X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e6992480e2e0cf965650f84aa97e01fe0fa71544..969ce8c5f889f8f2696c3ed4995f021b2a6539e1:/auto-blog.setup

diff --git a/auto-blog.setup b/auto-blog.setup
index fde7f17f8..cf77b3bf7 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -15,6 +15,7 @@ require IkiWiki::Setup::Automator;
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
 	gettext("What will the blog be named?"), gettext("blog"));
+our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
 our $rcs=IkiWiki::Setup::Automator::ask(
 	gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
@@ -27,15 +28,15 @@ IkiWiki::Setup::Automator->import(
 	wikiname => $wikiname,
 	adminuser => [$admin],
 	rcs => $rcs,
-	srcdir => "$ENV{HOME}/$wikiname",
-	destdir => "$ENV{HOME}/public_html/$wikiname",
-	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",
-	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
+	srcdir => "$ENV{HOME}/$wikiname_short",
+	destdir => "$ENV{HOME}/public_html/$wikiname_short",
+	repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
+	dumpsetup => "$ENV{HOME}/$wikiname_short.setup",
+	url => "http://$domain/~$ENV{USER}/$wikiname_short",
+	cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
+	cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",
 	adminemail => "$ENV{USER}\@$domain",
-	add_plugins => [qw{goodstuff websetup comments}],
+	add_plugins => [qw{goodstuff websetup comments blogspam}],
 	disable_plugins => [qw{}],
 	libdir => "$ENV{HOME}/.ikiwiki",
 	rss => 1,
@@ -44,5 +45,6 @@ IkiWiki::Setup::Automator->import(
 	
 	example => "blog",
 	comments_pagespec => "posts/* and !*/Discussion",
+	blogspam_pagespec => "postcomment(*)",
 	discussion => 0,
 )