From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 03/16] Configuration: No longer set password=<~/.xen-osstest/db-password> Date: Mon, 7 Dec 2015 17:27:21 +0000 Message-ID: <1449509254-27007-4-git-send-email-ian.jackson@eu.citrix.com> References: <1449509254-27007-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a5zZj-00088U-1A for xen-devel@lists.xenproject.org; Mon, 07 Dec 2015 17:27:47 +0000 In-Reply-To: <1449509254-27007-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 ec50d60..95e4d46 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 f801303..412766c 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 -- 1.7.10.4