Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

process_fts_updates: Support arbitrary database user and dbname. 

Co-authored-by: Adam Birds <adam.birds@adbwebdesigns.co.uk>
This commit is contained in:
Alex Vandiver 2021-05-24 20:43:00 -07:00 committed by Tim Abbott
parent 7ff3c9f966
commit c17f502bb0
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
puppet/zulip/files/postgresql/process_fts_updates
View File

@ -84,6 +84,17 @@ def am_master(cursor: psycopg2.extensions.cursor) -> bool:
return not cursor.fetchall()[0][0]
def get_config(
config_file: configparser.RawConfigParser,
section: str,
key: str,
default_value: str = "",
) -> str:
if config_file.has_option(section, key):
return config_file.get(section, key)
return default_value
pg_args = {}
USING_PGROONGA = False
@ -112,9 +123,18 @@ except ImportError:
config_file = configparser.RawConfigParser()
config_file.read("/etc/zulip/zulip.conf")
if config_file.has_option("machine", "pgroonga"):
USING_PGROONGA = True
pg_args["user"] = get_config(config_file, "postgresql", "database_user", "zulip")
if pg_args["user"] != "zulip":
secrets_file = configparser.RawConfigParser()
secrets_file.read("/etc/zulip/zulip-secrets.conf")
pg_args["password"] = get_config(secrets_file, "secrets", "postgres_password")
pg_args["host"] = "localhost"
pg_args["dbname"] = get_config(config_file, "postgresql", "database_name", "zulip")
conn = None
retries = 1