From f253f04f25af1d1d4b39c22a0146702b186c238e Mon Sep 17 00:00:00 2001 From: Srinivas Nyayapati Date: Wed, 19 Feb 2020 09:33:17 -0500 Subject: [PATCH 1/3] Remove configurable-http-proxy references from docs --- docs/topic/installer-actions.rst | 9 +++------ docs/troubleshooting/logs.rst | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/topic/installer-actions.rst b/docs/topic/installer-actions.rst index 21e381d..748086b 100644 --- a/docs/topic/installer-actions.rst +++ b/docs/topic/installer-actions.rst @@ -18,10 +18,8 @@ Hub environment =============== JupyterHub is run from a python3 virtual environment located in ``/opt/tljh/hub``. It -uses the system's installed python and is owned by root. It also contains a ``npm`` -install of `configurable-http-proxy `_ -and a binary install of `traefik `_. This virtual environment is -completely managed by TLJH. +uses the system's installed python and is owned by root. It also contains a binary install +of `traefik `_. This virtual environment is completely managed by TLJH. User environment ================ @@ -60,10 +58,9 @@ hard to access the ``tljh-config`` command used to change most config parameters Systemd Units ============= -TLJH places 3 systemd units on your computer. They all start on system startup. +TLJH places 2 systemd units on your computer. They all start on system startup. #. ``jupyterhub.service`` - starts the JupyterHub service. -#. ``configurable-http-proxy.service`` - starts the nodejs based proxy that is used by JupyterHub. #. ``traefik.service`` - starts traefik proxy that manages HTTPS In addition, each running Jupyter user gets their own systemd unit of the name ``jupyter-``. diff --git a/docs/troubleshooting/logs.rst b/docs/troubleshooting/logs.rst index 017b68d..315289f 100644 --- a/docs/troubleshooting/logs.rst +++ b/docs/troubleshooting/logs.rst @@ -8,7 +8,7 @@ Looking at Logs They contain a forensic record of what individual pieces of software were doing before things went bad, and can help us understand the problem so we can fix it. -TLJH collects logs from JupyterHub, Configurable HTTP Proxy, & from each individual +TLJH collects logs from JupyterHub, Traefik Proxy, & from each individual user's notebook server. All the logs are accessible via `journalctl `_. The installer also writes logs to disk, to help with cases where the installer did not succeed. From 6d4f13523ee4a679dee29ddc35abed4df3ed914b Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 25 Feb 2020 14:42:27 +0100 Subject: [PATCH 2/3] Use the same 1-100 numbers as in the docs --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 258d6c9..5f8866f 100644 --- a/README.rst +++ b/README.rst @@ -14,7 +14,7 @@ The Littlest JupyterHub :target: https://the-littlest-jupyterhub.readthedocs.io/en/latest/contributing/index.html **The Littlest JupyterHub** (TLJH) distribution helps you provide Jupyter Notebooks -to 1-50 users on a single server. +to 1-100 users on a single server. The primary audience are people who do not consider themselves 'system administrators' but would like to provide hosted Jupyter Notebooks for their students or users. From 04fb90ed7bb922a5b028e808e633211beabf3f76 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 26 Feb 2020 10:15:15 +0200 Subject: [PATCH 3/3] Fix installer --- tljh/installer.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tljh/installer.py b/tljh/installer.py index d8b8b63..5f6a098 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -254,18 +254,18 @@ def ensure_user_environment(user_requirements_txt_file): miniconda_old_version = '4.5.4' miniconda_new_version = '4.7.10' - conda_version = '4.5.8' + miniconda_installer_md5 = "1c945f2b3335c7b2b15130b1b2dc5cf4" - # If no prior miniconda installation is found, we can install a newer version - if not conda.check_miniconda_version( - USER_ENV_PREFIX, miniconda_old_version - ) and not conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version): - miniconda_installer_md5 = "1c945f2b3335c7b2b15130b1b2dc5cf4" + if conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version): conda_version = '4.8.1' - + elif conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_old_version): + conda_version = '4.5.8' + # If no prior miniconda installation is found, we can install a newer version + else: logger.info('Downloading & setting up user environment...') with conda.download_miniconda_installer(miniconda_new_version, miniconda_installer_md5) as installer_path: conda.install_miniconda(installer_path, USER_ENV_PREFIX) + conda_version = '4.8.1' conda.ensure_conda_packages(USER_ENV_PREFIX, [ # Conda's latest version is on conda much more so than on PyPI.