Added MyApp->config->{file}

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index c5c315e..6735051 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -575,10 +575,10 @@ sub setup {
     $class->setup_home( delete $flags->{home} );
 
     # YAML config support
-    my $confpath =
-      $class->path_to(
-        Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' );
-    my $conf = {};
+    my $conffile = $class->config->{file}
+      || ( Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' );
+    my $confpath = $class->path_to($conffile);
+    my $conf     = {};
     $conf = YAML::LoadFile($confpath) if -f $confpath;
     my $oldconf = $class->config;
     $class->config( { %$oldconf, %$conf } );