[Jifty-commit] r1968 - in jifty/trunk: lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Fri Sep 15 17:19:09 EDT 2006
Author: jesse
Date: Fri Sep 15 17:19:08 2006
New Revision: 1968
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Config.pm
Log:
r27513 at pinglin: jesse | 2006-09-15 21:36:00 +0100
* We should default the location of the jifty siteconfig file
Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm (original)
+++ jifty/trunk/lib/Jifty/Config.pm Fri Sep 15 17:19:08 2006
@@ -104,6 +104,7 @@
sub load {
my $self = shift;
+ $self->stash( Hash::Merge::merge( $self->_default_config_files, $self->stash ));
my $file = $ENV{'JIFTY_CONFIG'} || Jifty::Util->app_root . '/etc/config.yml';
@@ -128,6 +129,7 @@
my $config = Hash::Merge::merge( $self->stash, $vendor );
$self->stash($config);
+
my $site = $self->load_file(
Jifty::Util->absolute_path(
$self->framework('SiteConfig') || $ENV{'JIFTY_SITE_CONFIG'}
@@ -148,7 +150,7 @@
# Merge guessed values in for anything we didn't explicitly define
# Whatever's in the stash overrides anything we guess
$self->stash( Hash::Merge::merge( $self->guess, $self->stash ));
-
+
# There are a couple things we want to guess that we don't want
# getting stuck in a default config file for an app
$self->stash( Hash::Merge::merge( $self->defaults, $self->stash));
@@ -194,6 +196,17 @@
}
+sub _default_config_files {
+ my $self = shift;
+ my $config = {
+ framework => {
+ SiteConfig => 'etc/site_config.yml'
+ }
+ };
+ return $self->_expand_relative_paths($config);
+}
+
+
=head2 guess
Attempts to guess (and return) a configuration hash based solely
@@ -284,7 +297,7 @@
Web => {
DefaultStaticRoot => Jifty::Util->share_root . '/web/static',
DefaultTemplateRoot => Jifty::Util->share_root . '/web/templates',
- }
+ },
}
};
More information about the Jifty-commit
mailing list