diff --git a/tljh/jupyterhub_config.py b/tljh/jupyterhub_config.py index 95b62ef..4b39ea4 100644 --- a/tljh/jupyterhub_config.py +++ b/tljh/jupyterhub_config.py @@ -24,9 +24,14 @@ class CustomSpawner(SystemdSpawner): c.JupyterHub.spawner_class = CustomSpawner -c.ConfigurableHTTPProxy.should_start = False c.JupyterHub.port = 80 +# Use a high port so users can try this on machines with a JupyterHub already present +c.JupyterHub.hub_port = 15001 + +c.ConfigurableHTTPProxy.should_start = False +c.ConfigurableHTTPProxy.api_url = 'http://127.0.0.1:15002' + c.SystemdSpawner.extra_paths = [os.path.join(USER_ENV_PREFIX, 'bin')] configurer.apply_yaml_config(os.path.join(INSTALL_PREFIX, 'config.yaml'), c) diff --git a/tljh/systemd-units/configurable-http-proxy.service b/tljh/systemd-units/configurable-http-proxy.service index b7bf910..772cd79 100644 --- a/tljh/systemd-units/configurable-http-proxy.service +++ b/tljh/systemd-units/configurable-http-proxy.service @@ -20,5 +20,5 @@ ExecStart={install_prefix}/hub/bin/configurable-http-proxy \ --ip 0.0.0.0 \ --port 80 \ --api-ip 127.0.0.1 \ - --api-port 8001 \ - --error-target http://127.0.0.1:8081/hub/error + --api-port 15002 \ + --error-target http://127.0.0.1:15001/hub/error