Maintain two APNS connections and send correct notifications to each

Now we have 2 different Zulip apps out there, and they are signed with
two certs: Zulip and Dropbox. The Dropbox-signed apps are going to need
to be sent APNS notifications from the appropriate APNS connection

(imported from commit 6db50c5811847db4f08e5c997c7bbb4b46cfc462)
This commit is contained in:
Leo Franchi
2015-02-09 23:08:47 -08:00
parent 1c22b48bb1
commit d865732e0d
4 changed files with 45 additions and 21 deletions

View File

@@ -126,10 +126,12 @@ if DEPLOYED or STAGING_DEPLOYED:
APNS_SANDBOX = "push_production"
APNS_FEEDBACK = "feedback_production"
APNS_CERT_FILE = "/etc/ssl/django-private/apns-dist.pem"
DBX_APNS_CERT_FILE = "/etc/ssl/django-private/dbx-apns-dist.pem"
else:
APNS_SANDBOX = "push_sandbox"
APNS_FEEDBACK = "feedback_sandbox"
APNS_CERT_FILE = "/etc/ssl/django-private/apns-dev.pem"
DBX_APNS_CERT_FILE = "/etc/ssl/django-private/dbx-apns-dev.pem"
# GCM tokens are IP-whitelisted; if we deploy to additional
# servers you will need to explicitly add their IPs here:
@@ -208,3 +210,6 @@ API_SUPER_USERS = set(["tabbott/extra@mit.edu",
ADMINS = (
('Zulip Error Reports', 'errors@zulip.com'),
)
ZULIP_IOS_APP_ID = 'com.zulip.Zulip'
DBX_IOS_APP_ID = 'com.dropbox.Zulip'

View File

@@ -297,6 +297,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'EXTERNAL_URI_SCHEME': "https://",
'GOOGLE_CLIENT_ID': '',
'REDIS_PASSWORD': None,
'DBX_APNS_CERT_FILE': None,
}
for setting_name, setting_val in DEFAULT_SETTINGS.iteritems():