diff --git a/jupyterhub/singleuser.py b/jupyterhub/singleuser.py index 8be9cd86..84038173 100755 --- a/jupyterhub/singleuser.py +++ b/jupyterhub/singleuser.py @@ -247,15 +247,15 @@ class SingleUserNotebookApp(NotebookApp): @default('keyfile') def _keyfile_default(self): - return os.environ.get('JUPYTERHUB_NOTEBOOK_SSL_KEYFILE') or '' + return os.environ.get('JUPYTERHUB_SSL_KEYFILE') or '' @default('certfile') def _certfile_default(self): - return os.environ.get('JUPYTERHUB_NOTEBOOK_SSL_CERTFILE') or '' + return os.environ.get('JUPYTERHUB_SSL_CERTFILE') or '' @default('client_ca') 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') def _hub_prefix_default(self): diff --git a/jupyterhub/spawner.py b/jupyterhub/spawner.py index 343b565f..8218a10e 100644 --- a/jupyterhub/spawner.py +++ b/jupyterhub/spawner.py @@ -652,9 +652,9 @@ class Spawner(LoggingConfigurable): env['CPU_GUARANTEE'] = str(self.cpu_guarantee) if self.cert_paths: - env['JUPYTERHUB_NOTEBOOK_SSL_KEYFILE'] = self.cert_paths['keyfile'] - env['JUPYTERHUB_NOTEBOOK_SSL_CERTFILE'] = self.cert_paths['certfile'] - env['JUPYTERHUB_NOTEBOOK_SSL_CLIENT_CA'] = self.cert_paths['cafile'] + env['JUPYTERHUB_SSL_KEYFILE'] = self.cert_paths['keyfile'] + env['JUPYTERHUB_SSL_CERTFILE'] = self.cert_paths['certfile'] + env['JUPYTERHUB_SSL_CLIENT_CA'] = self.cert_paths['cafile'] return env