diff options
author | David A. Madore <david+git@madore.org> | 2014-10-03 15:53:02 +0200 |
---|---|---|
committer | David A. Madore <david+git@madore.org> | 2014-10-03 15:53:02 +0200 |
commit | 62f6c6df9e08d469a044e97e7450058146e07de1 (patch) | |
tree | dbe6c9eff3d7696770845b03ebe3d29f8ad83635 /org/madore/damlengine/WeblogDatabaseConnection.java | |
parent | 67b182059944b3a048a767c46d692472792dfd87 (diff) | |
download | damlengine-62f6c6df9e08d469a044e97e7450058146e07de1.tar.gz damlengine-62f6c6df9e08d469a044e97e7450058146e07de1.tar.bz2 damlengine-62f6c6df9e08d469a044e97e7450058146e07de1.zip |
Remove all templates from damlengine; introduce config variables instead.
Location of template files should now be specified by the
DAMLENGINE_TEMPLATE_PATH environment variable.
Diffstat (limited to 'org/madore/damlengine/WeblogDatabaseConnection.java')
-rw-r--r-- | org/madore/damlengine/WeblogDatabaseConnection.java | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/org/madore/damlengine/WeblogDatabaseConnection.java b/org/madore/damlengine/WeblogDatabaseConnection.java index 9347406..900f3a0 100644 --- a/org/madore/damlengine/WeblogDatabaseConnection.java +++ b/org/madore/damlengine/WeblogDatabaseConnection.java @@ -20,24 +20,48 @@ public final class WeblogDatabaseConnection { public static Connection getConnection() throws SQLException { if ( conn == null ) { - String dbHost = System.getenv("PGHOST"); + String dbHost = System.getenv("DAMLENGINE_PGHOST"); + if ( dbHost == null ) + dbHost = DamlEngine.appProps.getProperty("pghost"); + if ( dbHost == null ) + dbHost = System.getenv("PGHOST"); if ( dbHost == null ) dbHost = "localhost"; - String dbPort = System.getenv("PGPORT"); + String dbPort = System.getenv("DAMLENGINE_PGPORT"); + if ( dbPort == null ) + dbPort = DamlEngine.appProps.getProperty("pgport"); + if ( dbPort == null ) + dbPort = System.getenv("PGPORT"); if ( dbPort == null ) dbPort = "5432"; - String dbName = "weblog"; - String dbUser = System.getenv("PGUSER"); + String dbName = System.getenv("DAMLENGINE_DBNAME"); + if ( dbName == null ) + dbName = DamlEngine.appProps.getProperty("dbname"); + if ( dbName == null ) + dbName = "weblog"; + String dbUser = System.getenv("DAMLENGINE_PGUSER"); + if ( dbUser == null ) + dbUser = DamlEngine.appProps.getProperty("pguser"); + if ( dbUser == null ) + dbUser = System.getenv("PGUSER"); if ( dbUser == null ) dbUser = System.getenv("USER"); if ( dbUser == null ) dbUser = System.getProperty("user.name"); if ( dbUser == null ) dbUser = dbName; - String dbPass = System.getenv("PGPASSWORD"); + String dbPass = System.getenv("DAMLENGINE_PGPASSWORD"); + if ( dbPass == null ) + dbPass = DamlEngine.appProps.getProperty("pgpassword"); + if ( dbPass == null ) + dbPass = System.getenv("PGPASSWORD"); if ( dbPass == null ) try { - String dbPassFile = System.getenv("PGPASSFILE"); + String dbPassFile = System.getenv("DAMLENGINE_PGPASSFILE"); + if ( dbPassFile == null ) + dbPassFile = DamlEngine.appProps.getProperty("pgpassfile"); + if ( dbPassFile == null ) + dbPassFile = System.getenv("PGPASSFILE"); if ( dbPassFile == null ) dbPassFile = System.getProperty("user.home") + "/.pgpass"; |