Merge pull request #557 from nscuro/fix-db-password-file

Fix `ALPINE_DATABASE_PASSWORD_FILE` not being considered
stevespringett · May 5, 2024 · a610bbd · a610bbd
2 parents b0f9b6a + 0c7e149
commit a610bbd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/alpine-server/src/main/java/alpine/server/persistence/PersistenceManagerFactory.java b/alpine-server/src/main/java/alpine/server/persistence/PersistenceManagerFactory.java
@@ -356,7 +356,7 @@ private HikariConfig createBaseHikariConfig(final String poolName) {
         hikariConfig.setJdbcUrl(Config.getInstance().getProperty(Config.AlpineKey.DATABASE_URL));
         hikariConfig.setDriverClassName(Config.getInstance().getProperty(Config.AlpineKey.DATABASE_DRIVER));
         hikariConfig.setUsername(Config.getInstance().getProperty(Config.AlpineKey.DATABASE_USERNAME));
-        hikariConfig.setPassword(Config.getInstance().getProperty(Config.AlpineKey.DATABASE_PASSWORD));
+        hikariConfig.setPassword(Config.getInstance().getPropertyOrFile(Config.AlpineKey.DATABASE_PASSWORD));
 
         if (Config.getInstance().getPropertyAsBoolean(Config.AlpineKey.METRICS_ENABLED)) {
             hikariConfig.setMetricRegistry(Metrics.getRegistry());