From b14b12231a7fac5575bb94e0aaf2bca253c21f02 Mon Sep 17 00:00:00 2001 From: Stuart Campbell Date: Thu, 24 Aug 2017 16:53:25 -0400 Subject: [PATCH 1/2] Correct typo to have consistent comments --- jupyterhub/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyterhub/app.py b/jupyterhub/app.py index 06606670..9b76cafa 100644 --- a/jupyterhub/app.py +++ b/jupyterhub/app.py @@ -291,13 +291,13 @@ class JupyterHub(Application): ssl_key = Unicode('', help="""Path to SSL key file for the public facing interface of the proxy - Use with ssl_cert + Use with ssl_key """ ).tag(config=True) ssl_cert = Unicode('', help="""Path to SSL certificate file for the public facing interface of the proxy - Use with ssl_key + Use with ssl_cert """ ).tag(config=True) ip = Unicode('', From 1b7f54b4621434127a8bf9021cb347fb5ab8f3ef Mon Sep 17 00:00:00 2001 From: Stuart Campbell Date: Fri, 25 Aug 2017 14:52:23 -0400 Subject: [PATCH 2/2] Make SSL cert/key help clearer. --- jupyterhub/app.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jupyterhub/app.py b/jupyterhub/app.py index 9b76cafa..7c39ec07 100644 --- a/jupyterhub/app.py +++ b/jupyterhub/app.py @@ -291,13 +291,13 @@ class JupyterHub(Application): ssl_key = Unicode('', help="""Path to SSL key file for the public facing interface of the proxy - Use with ssl_key + When setting this, you should also set ssl_cert """ ).tag(config=True) ssl_cert = Unicode('', help="""Path to SSL certificate file for the public facing interface of the proxy - Use with ssl_cert + When setting this, you should also set ssl_key """ ).tag(config=True) ip = Unicode('', @@ -360,7 +360,7 @@ class JupyterHub(Application): proxy_cmd = Command([], config=True, help="DEPRECATED since version 0.8. Use ConfigurableHTTPProxy.command", ).tag(config=True) - + debug_proxy = Bool(False, help="DEPRECATED since version 0.8: Use ConfigurableHTTPProxy.debug", ).tag(config=True) @@ -465,7 +465,7 @@ class JupyterHub(Application): help="""The cookie secret to use to encrypt cookies. Loaded from the JPY_COOKIE_SECRET env variable by default. - + Should be exactly 256 bits (32 bytes). """ ).tag( @@ -1568,7 +1568,7 @@ class JupyterHub(Application): break else: self.log.error("Cannot connect to %s service %s at %s. Is it running?", service.kind, service_name, service.url) - + yield self.proxy.check_routes(self.users, self._service_map)