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. 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. diff --git a/tljh/installer.py b/tljh/installer.py index 092cec9..5f6a098 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -258,18 +258,14 @@ def ensure_user_environment(user_requirements_txt_file): 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: - if 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' - + 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.