Yaml formatted setup files are now produced by default

This has been a while coming. It turns out that non-excutable setup files
have a number of benefits. Also, I find YAML setup files easier to edit
myself, and I suspect many users will prefer not needing to deal with
perl syntax.
master
Joey Hess 2011-03-24 21:30:18 -04:00
parent 7821965ef0
commit 9df8971e57
5 changed files with 6 additions and 5 deletions

View File

@ -28,6 +28,7 @@ CGI::Session
Mail::Sendmail
CGI
Data::Dumper
YAML
=head1 AUTHOR

View File

@ -34,7 +34,6 @@ Text::WikiCreole
Term::ReadLine::Gnu
HTML::Tree
Sort::Naturally
YAML
=head1 AUTHOR

View File

@ -485,7 +485,7 @@ sub getsetup () {
},
setuptype => {
type => "internal",
default => "Standard",
default => "Yaml",
description => "perl class to use to dump setup file",
safe => 0,
rebuild => 0,
@ -505,7 +505,6 @@ sub defaultconfig () {
foreach my $key (keys %s) {
push @ret, $key, $s{$key}->{default};
}
use Data::Dumper;
return @ret;
}

2
debian/changelog vendored
View File

@ -1,5 +1,7 @@
ikiwiki (3.20110322) UNRELEASED; urgency=low
* Yaml formatted setup files are now produced by default.
(Perl formatted setup files can still be used.)
* Add timezone setting in setup file. This alows time zone to be configured
via the web.

4
debian/control vendored
View File

@ -20,7 +20,7 @@ Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends},
libtext-markdown-perl | markdown,
libhtml-scrubber-perl, libhtml-template-perl,
libhtml-parser-perl, liburi-perl (>= 1.36)
libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl
Recommends: gcc | c-compiler,
libc6-dev | libc-dev,
subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
@ -37,7 +37,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
po4a (>= 0.35-1), gettext, libyaml-perl
po4a (>= 0.35-1), gettext
Conflicts: ikiwiki-plugin-table
Replaces: ikiwiki-plugin-table
Provides: ikiwiki-plugin-table