diff --git a/data/etc/ikiwiki/plinth-blog.setup b/data/etc/ikiwiki/plinth-blog.setup index 9426257cf..c64bbc4c0 100644 --- a/data/etc/ikiwiki/plinth-blog.setup +++ b/data/etc/ikiwiki/plinth-blog.setup @@ -6,31 +6,31 @@ require IkiWiki::Setup::Automator; our $wikiname=$ARGV[0]; our $admin=$ARGV[1]; if (($wikiname eq "") || ($admin eq "")) { - print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-blog.setup blog_name admin_name"; - exit; + print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-blog.setup blog_name admin_name"; + exit; } our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname); IkiWiki::Setup::Automator->import( - wikiname => $wikiname, - adminuser => [$admin], - rcs => "git", - srcdir => "/var/lib/ikiwiki/$wikiname_short", - destdir => "/var/www/ikiwiki/$wikiname_short", - repository => "/var/lib/ikiwiki/$wikiname_short.git", - dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup", - url => "/ikiwiki/$wikiname_short", - cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi", - cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi", - add_plugins => [qw{goodstuff websetup comments calendar sidebar trail httpauth}], - rss => 1, - atom => 1, - syslog => 1, - example => "blog", - comments_pagespec => "posts/* and !*/Discussion", - archive_pagespec => "page(posts/*) and !*/Discussion", - global_sidebars => 0, - discussion => 0, - tagbase => "tags", + wikiname => $wikiname, + adminuser => [$admin], + rcs => "git", + srcdir => "/var/lib/ikiwiki/$wikiname_short", + destdir => "/var/www/ikiwiki/$wikiname_short", + repository => "/var/lib/ikiwiki/$wikiname_short.git", + dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup", + url => "/ikiwiki/$wikiname_short", + cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi", + add_plugins => [qw{goodstuff websetup comments calendar sidebar trail httpauth}], + rss => 1, + atom => 1, + syslog => 1, + example => "blog", + comments_pagespec => "posts/* and !*/Discussion", + archive_pagespec => "page(posts/*) and !*/Discussion", + global_sidebars => 0, + discussion => 0, + tagbase => "tags", ) diff --git a/data/etc/ikiwiki/plinth-wiki.setup b/data/etc/ikiwiki/plinth-wiki.setup index 3880eecab..9d564a8c2 100644 --- a/data/etc/ikiwiki/plinth-wiki.setup +++ b/data/etc/ikiwiki/plinth-wiki.setup @@ -6,25 +6,25 @@ require IkiWiki::Setup::Automator; our $wikiname=$ARGV[0]; our $admin=$ARGV[1]; if (($wikiname eq "") || ($admin eq "")) { - print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-wiki.setup wiki_name admin_name"; - exit; + print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-wiki.setup wiki_name admin_name"; + exit; } our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname); IkiWiki::Setup::Automator->import( - wikiname => $wikiname, - adminuser => [$admin], - rcs => "git", - srcdir => "/var/lib/ikiwiki/$wikiname_short", - destdir => "/var/www/ikiwiki/$wikiname_short", - repository => "/var/lib/ikiwiki/$wikiname_short.git", - dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup", - url => "/ikiwiki/$wikiname_short", - cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi", - cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi", - add_plugins => [qw{goodstuff websetup httpauth}], - rss => 1, - atom => 1, - syslog => 1, + wikiname => $wikiname, + adminuser => [$admin], + rcs => "git", + srcdir => "/var/lib/ikiwiki/$wikiname_short", + destdir => "/var/www/ikiwiki/$wikiname_short", + repository => "/var/lib/ikiwiki/$wikiname_short.git", + dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup", + url => "/ikiwiki/$wikiname_short", + cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi", + add_plugins => [qw{goodstuff websetup httpauth}], + rss => 1, + atom => 1, + syslog => 1, )