From 9c1cd3e7f7d9584843e3febe5ee325e59ea94ea9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 4 Dec 2015 18:00:48 +0000 Subject: [PATCH] Configuration: No longer set password=<~/.xen-osstest/db-password> Instead, expect the user to provide ~/.pgpass. This is a good idea because we don't really want to be handling passwords ourselves if we can help it. And, we are shortly going to want to do some exciting mangling of the database access configuration, which would be complicated by the presence of this password expansion. This may break for some users of existing Executive (non-standalone) setups which are using production-config-cambridge or the default built-in configuration. DEPLOYMENT NOTE: After this passes the push gate in Cambridge, /export/home/osstest/.{xen-,}osstest/db-password should be deleted to avoid confusion in the future. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- Osstest.pm | 3 +-- production-config-cambridge | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Osstest.pm b/Osstest.pm index ec50d606..95e4d467 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -191,8 +191,7 @@ sub readglobalconfig () { # dynamic default config settings $c{ExecutiveDbnamePat} ||= "dbname=;user=;". - "host=.db.$c{DnsDomain};". - "password=<~/.xen-osstest/db-password>" + "host=.db.$c{DnsDomain}" if defined $c{DnsDomain}; # 1. <\w+> is replaced with variables: # database name diff --git a/production-config-cambridge b/production-config-cambridge index 012a0560..83fb8121 100644 --- a/production-config-cambridge +++ b/production-config-cambridge @@ -23,7 +23,7 @@ HostDB_Executive_NoConfigDB 1 OwnerDaemonHost owner.daemon.osstest.xs.citrite.net QueueDaemonHost queue.daemon.osstest.xs.citrite.net -ExecutiveDbnamePat dbname=;user=;host=osstestdb.xs.citrite.net;password=<~/.xen-osstest/db-password> +ExecutiveDbnamePat dbname=;user=;host=osstestdb.xs.citrite.net HostnameSortSwapWords 1 -- 2.39.5