hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-12 20:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only internal_ssl kwargs if internal_ssl is enabled

Browse Source
This commit is contained in:
Thomas Mendoza
2018-06-07 16:00:57 -07:00
parent 3c21e7d45b
commit 25e6b31a5f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jupyterhub/user.py
View File

@@ -215,12 +215,18 @@ class User:
db=self.db, db=self.db,
oauth_client_id=client_id, oauth_client_id=client_id,
cookie_options = self.settings.get('cookie_options', {}), cookie_options = self.settings.get('cookie_options', {}),
internal_ssl=self.settings.get('internal_ssl'),
internal_certs_location=self.settings.get('internal_certs_location'),
internal_authority_name=self.settings.get('internal_authority_name'),
internal_notebook_authority_name=self.settings.get('internal_notebook_authority_name'),
trusted_alt_names=self.settings.get('trusted_alt_names'), trusted_alt_names=self.settings.get('trusted_alt_names'),
) )
if self.settings.get('internal_ssl'):
ssl_kwargs = dict(
internal_ssl=self.settings.get('internal_ssl'),
internal_certs_location=self.settings.get('internal_certs_location'),
internal_authority_name=self.settings.get('internal_authority_name'),
internal_notebook_authority_name=self.settings.get('internal_notebook_authority_name'),
)
spawn_kwargs.update(ssl_kwargs)
# update with kwargs. Mainly for testing. # update with kwargs. Mainly for testing.
spawn_kwargs.update(kwargs) spawn_kwargs.update(kwargs)
spawner = spawner_class(**spawn_kwargs) spawner = spawner_class(**spawn_kwargs)