paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-06 15:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated process_fts_updates to upstream version

Browse Source
This commit is contained in:
Alexander Trost
2017-03-22 00:03:39 +01:00
parent 6b91c34b87
commit a22048d22b
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
custom_zulip_files/puppet/zulip/files/postgresql/process_fts_updates
View File

@@ -76,12 +76,8 @@ if remote_postgres_host != '':
postgres_password = '' postgres_password = ''
if settings.DATABASES['default']['PASSWORD'] is not None: if settings.DATABASES['default']['PASSWORD'] is not None:
postgres_password = "password='%s'" % settings.DATABASES['default']['PASSWORD'] postgres_password = "password='%s'" % settings.DATABASES['default']['PASSWORD']
postgres_user = 'user=zulip' postgres_user = "user='%s'" % settings.DATABASES['default']['USER']
if settings.DATABASES['default']['USER'] is not None: postgres_dbname = "dbname='%s'" % settings.DATABASES['default']['NAME']
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']
if settings.REMOTE_POSTGRES_SSLMODE != '': if settings.REMOTE_POSTGRES_SSLMODE != '':
postgres_sslmode = settings.REMOTE_POSTGRES_SSLMODE postgres_sslmode = settings.REMOTE_POSTGRES_SSLMODE
else: else: