paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move postgres host configuration for zulip.com out of settings.py.

Browse Source 
(imported from commit fe95011ae86ff7c5f20c789b459a763326da374d)
This commit is contained in:
Tim Abbott
2015-08-22 13:24:39 -07:00
parent 930c64df8a
commit 17fd248f23
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zproject/local_settings.py
View File

@@ -41,6 +41,7 @@ NOREPLY_EMAIL_ADDRESS = "noreply@zulip.com"
SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"
REMOTE_POSTGRES_HOST = "postgres.zulip.net"
STATSD_HOST = 'stats.zulip.net'
if ZULIP_COM_STAGING:

12
zproject/settings.py
View File

@@ -155,6 +155,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'ZULIP_COM': False,
'ZULIP_COM_STAGING': False,
'STATSD_HOST': '',
'REMOTE_POSTGRES_HOST': '',
'GOOGLE_CLIENT_ID': '',
'DBX_APNS_CERT_FILE': None,
}
@@ -316,14 +317,11 @@ if DEVELOPMENT:
'PASSWORD': LOCAL_DATABASE_PASSWORD,
'HOST': 'localhost'
})
elif ZULIP_COM:
DATABASES["default"].update({
'HOST': 'postgres.zulip.net',
'OPTIONS': {
'sslmode': 'verify-full',
'connection_factory': TimeTrackingConnection
}
elif REMOTE_POSTGRES_HOST != '':
DATABASES['default'].update({
'HOST': REMOTE_POSTGRES_HOST,
})
DATABASES['default']['OPTIONS']['sslmode'] = 'verify-full'
########################################################################
# RABBITMQ CONFIGURATION