From 9d9e6255b92d1d40543b59e424bc90738e475765 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 28 Dec 2019 16:18:26 -0500 Subject: [PATCH] define constant for PGPASSWORD env var --- .../wizard/server/config/PgRestServerConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java index 8c03498..3292331 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java @@ -37,6 +37,8 @@ import static org.cobbzilla.util.system.CommandShell.execScript; @Slf4j public class PgRestServerConfiguration extends RestServerConfiguration implements HasDatabaseConfiguration { + public static final String ENV_PGPASSWORD = "PGPASSWORD"; + private DatabaseConfiguration database; @Override @Bean public DatabaseConfiguration getDatabase() { return database; } @Override public void setDatabase(DatabaseConfiguration config) { this.database = config; } @@ -182,7 +184,7 @@ public class PgRestServerConfiguration extends RestServerConfiguration implement command = ArrayUtil.arrayToString(pgCommand(command, db, user), " ", "", false); final File pgPassFile = getPgPassFile(); return pgPassFile != null && pgPassFile.exists() - ? "PGPASSWORD=\"$(cat " + abs(pgPassFile) + ")\" " + command + ? ENV_PGPASSWORD+"=\"$(cat " + abs(pgPassFile) + ")\" " + command : command; } @@ -201,7 +203,7 @@ public class PgRestServerConfiguration extends RestServerConfiguration implement final Map env = new HashMap<>(); env.putAll(getEnvironment()); - env.put("PGPASSWORD", dbPass); + env.put(ENV_PGPASSWORD, dbPass); String path = env.get("PATH"); if (path == null) { path = "/bin:/usr/bin:/usr/local/bin";