mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-09-19 04:59:01 +00:00
ikiwiki: Fix indentation in setup automators.
This commit is contained in:
parent
124656b5ba
commit
7d80c95048
@ -6,31 +6,31 @@ require IkiWiki::Setup::Automator;
|
|||||||
our $wikiname=$ARGV[0];
|
our $wikiname=$ARGV[0];
|
||||||
our $admin=$ARGV[1];
|
our $admin=$ARGV[1];
|
||||||
if (($wikiname eq "") || ($admin eq "")) {
|
if (($wikiname eq "") || ($admin eq "")) {
|
||||||
print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-blog.setup blog_name admin_name";
|
print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-blog.setup blog_name admin_name";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
|
our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
|
||||||
|
|
||||||
IkiWiki::Setup::Automator->import(
|
IkiWiki::Setup::Automator->import(
|
||||||
wikiname => $wikiname,
|
wikiname => $wikiname,
|
||||||
adminuser => [$admin],
|
adminuser => [$admin],
|
||||||
rcs => "git",
|
rcs => "git",
|
||||||
srcdir => "/var/lib/ikiwiki/$wikiname_short",
|
srcdir => "/var/lib/ikiwiki/$wikiname_short",
|
||||||
destdir => "/var/www/ikiwiki/$wikiname_short",
|
destdir => "/var/www/ikiwiki/$wikiname_short",
|
||||||
repository => "/var/lib/ikiwiki/$wikiname_short.git",
|
repository => "/var/lib/ikiwiki/$wikiname_short.git",
|
||||||
dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup",
|
dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup",
|
||||||
url => "/ikiwiki/$wikiname_short",
|
url => "/ikiwiki/$wikiname_short",
|
||||||
cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
||||||
cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
||||||
add_plugins => [qw{goodstuff websetup comments calendar sidebar trail httpauth}],
|
add_plugins => [qw{goodstuff websetup comments calendar sidebar trail httpauth}],
|
||||||
rss => 1,
|
rss => 1,
|
||||||
atom => 1,
|
atom => 1,
|
||||||
syslog => 1,
|
syslog => 1,
|
||||||
example => "blog",
|
example => "blog",
|
||||||
comments_pagespec => "posts/* and !*/Discussion",
|
comments_pagespec => "posts/* and !*/Discussion",
|
||||||
archive_pagespec => "page(posts/*) and !*/Discussion",
|
archive_pagespec => "page(posts/*) and !*/Discussion",
|
||||||
global_sidebars => 0,
|
global_sidebars => 0,
|
||||||
discussion => 0,
|
discussion => 0,
|
||||||
tagbase => "tags",
|
tagbase => "tags",
|
||||||
)
|
)
|
||||||
|
|||||||
@ -6,25 +6,25 @@ require IkiWiki::Setup::Automator;
|
|||||||
our $wikiname=$ARGV[0];
|
our $wikiname=$ARGV[0];
|
||||||
our $admin=$ARGV[1];
|
our $admin=$ARGV[1];
|
||||||
if (($wikiname eq "") || ($admin eq "")) {
|
if (($wikiname eq "") || ($admin eq "")) {
|
||||||
print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-wiki.setup wiki_name admin_name";
|
print "Usage: ikiwiki -setup /etc/ikiwiki/plinth-wiki.setup wiki_name admin_name";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
|
our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);
|
||||||
|
|
||||||
IkiWiki::Setup::Automator->import(
|
IkiWiki::Setup::Automator->import(
|
||||||
wikiname => $wikiname,
|
wikiname => $wikiname,
|
||||||
adminuser => [$admin],
|
adminuser => [$admin],
|
||||||
rcs => "git",
|
rcs => "git",
|
||||||
srcdir => "/var/lib/ikiwiki/$wikiname_short",
|
srcdir => "/var/lib/ikiwiki/$wikiname_short",
|
||||||
destdir => "/var/www/ikiwiki/$wikiname_short",
|
destdir => "/var/www/ikiwiki/$wikiname_short",
|
||||||
repository => "/var/lib/ikiwiki/$wikiname_short.git",
|
repository => "/var/lib/ikiwiki/$wikiname_short.git",
|
||||||
dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup",
|
dumpsetup => "/var/lib/ikiwiki/$wikiname_short.setup",
|
||||||
url => "/ikiwiki/$wikiname_short",
|
url => "/ikiwiki/$wikiname_short",
|
||||||
cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
cgiurl => "/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
||||||
cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
cgi_wrapper => "/var/www/ikiwiki/$wikiname_short/ikiwiki.cgi",
|
||||||
add_plugins => [qw{goodstuff websetup httpauth}],
|
add_plugins => [qw{goodstuff websetup httpauth}],
|
||||||
rss => 1,
|
rss => 1,
|
||||||
atom => 1,
|
atom => 1,
|
||||||
syslog => 1,
|
syslog => 1,
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user