Changeset eb450c826099602e236f2f25e3bcd12cca2e42f7

Timestamp:

12/14/09 19:33:44 (9 months ago)

Author:

Stephen Bennett <spb@…>

Parents:

31bf8409057e2901b16a35810545682a2fbf8c31

Children:

5927ceb6d488166b983d722df19194b526266439

git-committer:

Stephen Bennett <spb@exherbo.org> / 2009-12-14T19:33:44Z+0000

Message:

Make GMS::Config read config from gms_web.conf, instead of duplicating settings. Patch by Khisanth

Files:

• Makefile.PL (modified) (1 diff)
• gms_web.conf (modified) (1 diff)
• lib/GMS/Config.pm (modified) (1 diff)

Makefile.PL

@@ -24 +24 @@
 requires 'DBIx::Class';
 requires 'String::Random';
+requires 'Dir::Self';
+requires 'Config::JFDI';
 
 catalyst;

gms_web.conf

@@ -4 +4 @@
 
 <Model::DB>
-    connect_info dbi:Pg:dbname=gms;host=localhost
+    <connect_info>
+                dsn dbi:Pg:dbname=gms;host=localhost
+    </connect_info>
 </Model::DB>
 

lib/GMS/Config.pm

@@ -3 +3 @@
 use strict;
 use warnings;
-
+use Config::JFDI;
+use Dir::Self;
 use vars qw($dbstring $dbuser $dbpass
             $atheme_host $atheme_port $service
             $atheme_master_login $atheme_master_pass);
 
-$dbstring = 'dbi:Pg:dbname=gms';
-$dbuser = '';
-$dbpass = '';
-$atheme_host = 'localhost';
-$atheme_port = '8080';
+my $config_loader = Config::JFDI->new(
+        name => "gms_web",
+        path => __DIR__ . "/../..",
+);
+my $config = $config_loader->get;
+
+$dbstring = $config->{"Model::DB"}{connect_info}{dsn};
+$dbuser = $config->{"Model::DB"}{connect_info}{user};
+$dbpass = $config->{"Model::DB"}{connect_info}{password};
+$atheme_host = $config->{"Model::Atheme"}{atheme_host};
+$atheme_port = $config->{"Model::Atheme"}{atheme_port};
 $service = 'GroupServ';
-$atheme_master_login = 'GMS';
-$atheme_master_pass = 'goat';
+$atheme_master_login = $config->{"Model::Atheme"}{master_account};
+$atheme_master_pass = $config->{"Model::Atheme"}{master_password};
+
+1;