From a22048d22b455075a272a60a73c9e9066e29f1ac Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Wed, 22 Mar 2017 00:03:39 +0100 Subject: [PATCH] Updated process_fts_updates to upstream version --- .../puppet/zulip/files/postgresql/process_fts_updates | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates b/custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates index 818c575..2e346d6 100644 --- a/custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates +++ b/custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates @@ -76,12 +76,8 @@ if remote_postgres_host != '': postgres_password = '' if settings.DATABASES['default']['PASSWORD'] is not None: postgres_password = "password='%s'" % settings.DATABASES['default']['PASSWORD'] - postgres_user = 'user=zulip' - if settings.DATABASES['default']['USER'] is not None: - postgres_user = "user='%s'" % settings.DATABASES['default']['USER'] - postgres_dbname = 'dbname=zulip' - if settings.DATABASES['default']['NAME'] is not None: - postgres_dbname = "dbname='%s'" % settings.DATABASES['default']['NAME'] + postgres_user = "user='%s'" % settings.DATABASES['default']['USER'] + postgres_dbname = "dbname='%s'" % settings.DATABASES['default']['NAME'] if settings.REMOTE_POSTGRES_SSLMODE != '': postgres_sslmode = settings.REMOTE_POSTGRES_SSLMODE else: