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

remove NOTEBOOK from internal ssl env

Browse Source
This commit is contained in:
Min RK
2018-09-28 13:58:28 +02:00
parent 5fbd4f2d4e
commit 94bb9ed00d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jupyterhub/singleuser.py
View File

@@ -247,15 +247,15 @@ class SingleUserNotebookApp(NotebookApp):
@default('keyfile') @default('keyfile')
def _keyfile_default(self): def _keyfile_default(self):
return os.environ.get('JUPYTERHUB_NOTEBOOK_SSL_KEYFILE') or '' return os.environ.get('JUPYTERHUB_SSL_KEYFILE') or ''
@default('certfile') @default('certfile')
def _certfile_default(self): def _certfile_default(self):
return os.environ.get('JUPYTERHUB_NOTEBOOK_SSL_CERTFILE') or '' return os.environ.get('JUPYTERHUB_SSL_CERTFILE') or ''
@default('client_ca') @default('client_ca')
def _client_ca_default(self): def _client_ca_default(self):
return os.environ.get('JUPYTERHUB_NOTEBOOK_SSL_CLIENT_CA') or '' return os.environ.get('JUPYTERHUB_SSL_CLIENT_CA') or ''
@default('hub_prefix') @default('hub_prefix')
def _hub_prefix_default(self): def _hub_prefix_default(self):

6
jupyterhub/spawner.py
View File

@@ -652,9 +652,9 @@ class Spawner(LoggingConfigurable):
env['CPU_GUARANTEE'] = str(self.cpu_guarantee) env['CPU_GUARANTEE'] = str(self.cpu_guarantee)
if self.cert_paths: if self.cert_paths:
env['JUPYTERHUB_NOTEBOOK_SSL_KEYFILE'] = self.cert_paths['keyfile'] env['JUPYTERHUB_SSL_KEYFILE'] = self.cert_paths['keyfile']
env['JUPYTERHUB_NOTEBOOK_SSL_CERTFILE'] = self.cert_paths['certfile'] env['JUPYTERHUB_SSL_CERTFILE'] = self.cert_paths['certfile']
env['JUPYTERHUB_NOTEBOOK_SSL_CLIENT_CA'] = self.cert_paths['cafile'] env['JUPYTERHUB_SSL_CLIENT_CA'] = self.cert_paths['cafile']
return env return env