diff --git a/conf/jupyterhub_config.py b/conf/jupyterhub_config.py index bbe237b..7a52837 100644 --- a/conf/jupyterhub_config.py +++ b/conf/jupyterhub_config.py @@ -92,7 +92,7 @@ c.JupyterHub.authenticator_class = 'ldapauthenticator.LDAPAuthenticator' ## The public facing URL of the whole JupyterHub application. # # This is the address on which the proxy will bind. Sets protocol, ip, base_url -c.JupyterHub.bind_url = '0.0.0.0:__PORT__/__PATH__' +c.JupyterHub.bind_url = 'http://0.0.0.0:__PORT____PATH__' ## Whether to shutdown the proxy when the Hub shuts down. # @@ -466,7 +466,7 @@ c.JupyterHub.bind_url = '0.0.0.0:__PORT__/__PATH__' # Some spawners allow shell-style expansion here, allowing you to use # environment variables. Most, including the default, do not. Consult the # documentation for your spawner to verify! -c.Spawner.cmd = ['/opt/miniconda3/bin/jupyter-labhub'] +c.Spawner.cmd = ['__FINAL_PATH__/bin/jupyter-labhub'] ## Maximum number of consecutive failures to allow before shutting down # JupyterHub. diff --git a/scripts/_common.sh b/scripts/_common.sh index a581e78..c5bdfc2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -29,6 +29,7 @@ config_jupyterlab() { ynh_replace_string "__URL__" "https://$domain" $jupyterlab_conf_path ynh_replace_string "__PATH__" "${path_url%/}" $jupyterlab_conf_path ynh_replace_string "__PORT__" "$port" $jupyterlab_conf_path + ynh_replace_string "__FINAL_PATH__" "$final_path" $jupyterlab_conf_path ynh_store_file_checksum $jupyterlab_conf_path } diff --git a/scripts/install b/scripts/install index 7d47ccd..f0312d8 100644 --- a/scripts/install +++ b/scripts/install @@ -84,14 +84,14 @@ wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh bash Miniconda3-latest-Linux-x86_64.sh -b -p $final_path -/opt/miniconda3/bin/conda install -c conda-forge jupyterhub notebook jupyterlab jupyterhub-ldapauthenticator -y +$final_path/bin/conda install -c conda-forge jupyterhub notebook jupyterlab jupyterhub-ldapauthenticator -y #================================================= # SPECIFIC SETUP #================================================= -/opt/miniconda3/bin/jupyter labextension install @jupyterlab/hub-extension -/opt/miniconda3/bin/jupyter lab build +$final_path/bin/jupyter labextension install @jupyterlab/hub-extension +$final_path/bin/jupyter lab build #TODO Add admin