diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-05-15 18:20:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-05-15 18:20:52 -0400 |
| commit | 0438de905b1009c02e653f11983f2ad501b02a30 (patch) | |
| tree | 0930d9bf804830d6c2d242d92bd08fbde797bf78 | |
| parent | c7b1eb242fc5b910f138aeadbae7a232badba84f (diff) | |
ENV can be used in the setup file to override environment variable setting, such as TZ or PATH.
| -rw-r--r-- | IkiWiki.pm | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/ikiwiki.setup | 6 | ||||
| -rw-r--r-- | doc/todo/configurable_timezones.mdwn | 2 |
4 files changed, 16 insertions, 0 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 88407584f..7e64518b3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -103,6 +103,12 @@ sub checkconfig () { #{{{ } } + if (ref $config{ENV} eq 'HASH') { + foreach my $val (keys %{$config{ENV}}) { + $ENV{$val}=$config{ENV}{$val}; + } + } + if ($config{w3mmode}) { eval q{use Cwd q{abs_path}}; error($@) if $@; diff --git a/debian/changelog b/debian/changelog index df09e91c5..6e8e550df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (2.47) UNRELEASED; urgency=low it just expanded to nothing. * git: Skip over signed-off-by and similar lines in commit messages when generating recentchanges. + * ENV can be used in the setup file to override environment variable + setting, such as TZ or PATH. -- Joey Hess <joeyh@debian.org> Tue, 13 May 2008 12:30:18 -0400 diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index 7813eb822..3d3c2a7f6 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -143,6 +143,12 @@ use IkiWiki::Setup::Standard { #disable_plugins => [qw{inline htmlscrubber passwordauth openid}], # To add a directory to the perl search path, use this. #libdir => "/home/me/.ikiwiki/", + + # To override environment variable settings, you can list values here. + #ENV => { + # TZ => "America/New_York", + # PATH => "/home/me/bin:/usr/local/bin:/usr/bin:/bin", + #}, # For use with the tag plugin, make all tags be located under a # base page. diff --git a/doc/todo/configurable_timezones.mdwn b/doc/todo/configurable_timezones.mdwn index 594cc0f1f..3ed50503a 100644 --- a/doc/todo/configurable_timezones.mdwn +++ b/doc/todo/configurable_timezones.mdwn @@ -1,3 +1,5 @@ It would be nice if the sure could set the timezone of the wiki, and have ikiwiki render the pages with that timezone. This is nice for shared hosting, and other situation where the user doesn't have control over the server timezone. + +> [[done]] via the ENV setting in the setup file. --[[Joey]] |