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

db: Use the pre-computed values from settings.

Browse Source 
Rather than duplicate logic from `computed_settings`, use the values
that were computed therein.

Co-authored-by: Adam Birds <adam.birds@adbwebdesigns.co.uk>
This commit is contained in:
Alex Vandiver
2021-05-24 22:08:10 -07:00
committed by Tim Abbott
parent 94d7c29d92
commit 9c652eb16b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,19 +97,16 @@ try:
os.environ["DJANGO_SETTINGS_MODULE"] = "zproject.settings"
from django.conf import settings
if settings.REMOTE_POSTGRES_HOST != "":
pg_args["host"] = settings.REMOTE_POSTGRES_HOST
if settings.REMOTE_POSTGRES_PORT != "":
pg_args["port"] = settings.REMOTE_POSTGRES_PORT
if settings.DATABASES["default"]["HOST"] != "":
pg_args["host"] = settings.DATABASES["default"]["HOST"]
if settings.DATABASES["default"].get("PORT"):
pg_args["port"] = settings.DATABASES["default"]["PORT"]
pg_args["password"] = ""
if settings.DATABASES["default"]["PASSWORD"] is not None:
pg_args["password"] = settings.DATABASES["default"]["PASSWORD"]
pg_args["user"] = settings.DATABASES["default"]["USER"]
pg_args["dbname"] = settings.DATABASES["default"]["NAME"]
if settings.REMOTE_POSTGRES_SSLMODE != "":
pg_args["sslmode"] = settings.REMOTE_POSTGRES_SSLMODE
else:
pg_args["sslmode"] = "verify-full"
pg_args["sslmode"] = settings.DATABASES["default"]["OPTIONS"].get("sslmode")
pg_args["connect_timeout"] = "600"
USING_PGROONGA = settings.USING_PGROONGA
except ImportError: