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 <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index ec50d60649d4233587f27f712f2ac9a5f6c35fd3..95e4d4671406105cfad614245e80a734d52613bf 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -191,8 +191,7 @@ sub readglobalconfig () {
 
     # dynamic default config settings
     $c{ExecutiveDbnamePat} ||= "dbname=<dbname>;user=<whoami>;".
-       "host=<dbname>.db.$c{DnsDomain};".
-       "password=<~/.xen-osstest/db-password>"
+       "host=<dbname>.db.$c{DnsDomain}"
        if defined $c{DnsDomain};
     # 1. <\w+> is replaced with variables:
     #         <dbname>    database name

diff --git a/production-config-cambridge b/production-config-cambridge
index 012a056039e58556bfaa527b97e87774180a3774..83fb812104a71a3264615db6ce0a9b746efe7b53 100644 (file)
--- 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=<dbname>;user=<whoami>;host=osstestdb.xs.citrite.net;password=<~/.xen-osstest/db-password>
+ExecutiveDbnamePat dbname=<dbname>;user=<whoami>;host=osstestdb.xs.citrite.net
 
 HostnameSortSwapWords 1