diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-12-08 17:54:49 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-01-09 12:14:44 +0000 |
| commit | ef4b6c37e1890ec1c017507eb3d0a11e6cfa20d3 (patch) | |
| tree | 77606ed2f4092da610ec67862a5bd8c6064b1d14 | |
| parent | bc7b6ef0d99a10f5c5d370df195cb5f80f145b0a (diff) | |
BCI -> FMS in config values
| -rw-r--r-- | conf/general-example | 12 | ||||
| -rw-r--r-- | perllib/FixMyStreet.pm | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/conf/general-example b/conf/general-example index 65e192b4d..83a4c9dd4 100644 --- a/conf/general-example +++ b/conf/general-example @@ -18,12 +18,12 @@ * */ -// PostgreSQL database for BCI -define('OPTION_BCI_DB_HOST', 'localhost'); -define('OPTION_BCI_DB_PORT', '5432'); -define('OPTION_BCI_DB_NAME', 'bci'); -define('OPTION_BCI_DB_USER', 'bci'); -define('OPTION_BCI_DB_PASS', ''); +// PostgreSQL database for FMS +define('OPTION_FMS_DB_HOST', 'localhost'); +define('OPTION_FMS_DB_PORT', '5432'); +define('OPTION_FMS_DB_NAME', 'bci'); +define('OPTION_FMS_DB_USER', 'bci'); +define('OPTION_FMS_DB_PASS', ''); define('OPTION_BASE_URL', 'http://www.example.org'); diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm index d63f708d2..2d8f462d5 100644 --- a/perllib/FixMyStreet.pm +++ b/perllib/FixMyStreet.pm @@ -107,15 +107,15 @@ sub dbic_connect_info { my $class = shift; my $config = $class->config; - my $dsn = "dbi:Pg:dbname=" . $config->{BCI_DB_NAME}; - $dsn .= ";host=$config->{BCI_DB_HOST}" - if $config->{BCI_DB_HOST}; - $dsn .= ";port=$config->{BCI_DB_PORT}" - if $config->{BCI_DB_PORT}; + my $dsn = "dbi:Pg:dbname=" . $config->{FMS_DB_NAME}; + $dsn .= ";host=$config->{FMS_DB_HOST}" + if $config->{FMS_DB_HOST}; + $dsn .= ";port=$config->{FMS_DB_PORT}" + if $config->{FMS_DB_PORT}; $dsn .= ";sslmode=allow"; - my $user = $config->{BCI_DB_USER} || undef; - my $password = $config->{BCI_DB_PASS} || undef; + my $user = $config->{FMS_DB_USER} || undef; + my $password = $config->{FMS_DB_PASS} || undef; my $dbi_args = { AutoCommit => 1, @@ -146,11 +146,11 @@ sub configure_mysociety_dbhandle { my $config = $class->config; mySociety::DBHandle::configure( - Name => $config->{BCI_DB_NAME}, - User => $config->{BCI_DB_USER}, - Password => $config->{BCI_DB_PASS}, - Host => $config->{BCI_DB_HOST} || undef, - Port => $config->{BCI_DB_PORT} || undef, + Name => $config->{FMS_DB_NAME}, + User => $config->{FMS_DB_USER}, + Password => $config->{FMS_DB_PASS}, + Host => $config->{FMS_DB_HOST} || undef, + Port => $config->{FMS_DB_PORT} || undef, ); } |