setup file ordering

master
Joey Hess 2010-02-12 06:35:52 -05:00
parent 20ba12802b
commit 34fff64e7b
39 changed files with 32 additions and 11 deletions

View File

@ -43,7 +43,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "special-purpose",
}, },
aggregateinternal => { aggregateinternal => {
type => "boolean", type => "boolean",

View File

@ -45,7 +45,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 0, safe => 0,
rebuild => 0, rebuild => 0,
section => "special-purpose",
}, },
amazon_s3_key_id => { amazon_s3_key_id => {
type => "string", type => "string",

View File

@ -16,7 +16,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => 0, rebuild => 0,
section => "special-purpose",
}, },
} }

View File

@ -38,6 +38,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
archivebase => { archivebase => {
type => "string", type => "string",

View File

@ -18,6 +18,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -16,7 +16,7 @@ sub getsetup {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "core", section => "widget",
}, },
} }

View File

@ -19,6 +19,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -15,6 +15,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -15,6 +15,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -16,6 +16,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -18,6 +18,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -16,6 +16,7 @@ sub getsetup {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -19,6 +19,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -16,6 +16,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -19,6 +19,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
directive_description_dir => { directive_description_dir => {
type => "string", type => "string",

View File

@ -21,6 +21,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -17,6 +17,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -16,6 +16,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -15,6 +15,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -27,6 +27,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -15,7 +15,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "special-purpose",
}, },
} }

View File

@ -21,7 +21,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => 0, rebuild => 0,
section => "special-purpose",
}, },
pinger_timeout => { pinger_timeout => {
type => "integer", type => "integer",

View File

@ -17,6 +17,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -20,6 +20,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -16,6 +16,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -18,6 +18,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -22,7 +22,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => 1, rebuild => 1,
section => "core",
}, },
recentchangespage => { recentchangespage => {
type => "string", type => "string",

View File

@ -16,7 +16,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 0, safe => 0,
rebuild => 0, rebuild => 0,
section => "special-purpose",
}, },
rsync_command => { rsync_command => {
type => "string", type => "string",

View File

@ -16,6 +16,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -24,6 +24,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -16,6 +16,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -19,6 +19,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -15,7 +15,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "special-purpose",
}, },
} }

View File

@ -31,6 +31,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
teximg_dvipng => { teximg_dvipng => {
type => "boolean", type => "boolean",

View File

@ -18,6 +18,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -20,6 +20,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -18,7 +18,6 @@ sub getsetup () {
plugin => { plugin => {
safe => 0, safe => 0,
rebuild => undef, rebuild => undef,
section => "special-purpose",
}, },
add_underlays => { add_underlays => {
type => "string", type => "string",

View File

@ -17,6 +17,7 @@ sub getsetup () {
plugin => { plugin => {
safe => 1, safe => 1,
rebuild => undef, rebuild => undef,
section => "widget",
}, },
} }

View File

@ -121,9 +121,11 @@ sub getsetup () {
$config{syslog}=$syslog; $config{syslog}=$syslog;
return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} } return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} }
sort { # core first, then alphabetical sort { # core first, other last, otherwise alphabetical
($b eq "core") <=> ($a eq "core") ($b eq "core") <=> ($a eq "core")
|| ||
($a eq "other") <=> ($b eq "other")
||
$a cmp $b $a cmp $b
} keys %sections; } keys %sections;
} }