mirror of
https://github.com/YunoHost-Apps/jupyterlab_ynh.git
synced 2024-09-03 19:26:35 +02:00
Cleaning up
This commit is contained in:
parent
9c8c9987a4
commit
5ef7a54946
4 changed files with 5 additions and 60 deletions
|
@ -110,21 +110,8 @@ fi
|
||||||
# CONFIGURE JUPYTERLAB
|
# CONFIGURE JUPYTERLAB
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
#ynh_backup_if_checksum_is_different --file="$final_path/config/jupyterhub_config.py"
|
|
||||||
|
|
||||||
domain=$new_domain
|
domain=$new_domain
|
||||||
path_url=${new_path%/}
|
path=${new_path%/}
|
||||||
|
|
||||||
# cp -f ../conf/jupyterhub_config.py $final_path/config/jupyterhub_config.py
|
|
||||||
# ynh_replace_string --match_string="__URL__" --replace_string="https://$domain" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PATH__" --replace_string="${path_url%/}" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT_HUB__" --replace_string="$port_hub" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT_HTTP_PROXY__" --replace_string="$port_http_proxy" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
|
|
||||||
# ynh_store_file_checksum --file="$final_path/config/jupyterhub_config.py"
|
|
||||||
|
|
||||||
ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_path/config/jupyterhub_config.py"
|
ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_path/config/jupyterhub_config.py"
|
||||||
|
|
||||||
|
|
|
@ -134,34 +134,12 @@ ynh_add_systemd_config
|
||||||
|
|
||||||
mkdir -p "$final_path/config"
|
mkdir -p "$final_path/config"
|
||||||
|
|
||||||
# JupyterHub configuration
|
path=${path_url%/}
|
||||||
# cp -f ../conf/jupyterhub_config.py $final_path/config/jupyterhub_config.py
|
|
||||||
|
|
||||||
# ynh_replace_string --match_string="__URL__" --replace_string="https://$domain" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PATH__" --replace_string="${path_url%/}" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT_HUB__" --replace_string="$port_hub" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT_HTTP_PROXY__" --replace_string="$port_http_proxy" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
|
|
||||||
ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_path/config/jupyterhub_config.py"
|
ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_path/config/jupyterhub_config.py"
|
||||||
|
|
||||||
# Jupyter notebook configuration
|
|
||||||
# cp -f ../conf/jupyter_notebook_config.py $final_path/config/jupyter_notebook_config.py
|
|
||||||
|
|
||||||
# ynh_replace_string --match_string="__ENABLE_TERMINAL__" --replace_string="$enable_terminal" --target_file="$final_path/config/jupyter_notebook_config.py"
|
|
||||||
|
|
||||||
ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
|
ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# STORE THE CONFIG FILE CHECKSUM
|
|
||||||
#=================================================
|
|
||||||
|
|
||||||
# Calculate and store the config file checksum into the app settings
|
|
||||||
# ynh_store_file_checksum --file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_store_file_checksum --file="$final_path/config/jupyter_notebook_config.py"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# GENERIC FINALIZATION
|
# GENERIC FINALIZATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -108,7 +108,7 @@ yunohost service add $app --description="$app daemon" --log="$app"
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Starting a systemd service..." --weight=5
|
ynh_script_progression --message="Starting a systemd service..." --weight=5
|
||||||
|
|
||||||
ynh_systemd_action --service_name=$app --action="start" --line_match="JupyterHub is now running at" --log_path="systemd"
|
ynh_systemd_action --service_name=$app --action=start --line_match="JupyterHub is now running at" --log_path="systemd"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# GENERIC FINALIZATION
|
# GENERIC FINALIZATION
|
||||||
|
|
|
@ -132,32 +132,12 @@ fi
|
||||||
# STORE THE CONFIG FILE CHECKSUM
|
# STORE THE CONFIG FILE CHECKSUM
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
#ynh_backup_if_checksum_is_different --file="$final_path/config/jupyterhub_config.py"
|
|
||||||
|
|
||||||
mkdir -p "$final_path/config"
|
mkdir -p "$final_path/config"
|
||||||
|
|
||||||
# cp -f ../conf/jupyterhub_config.py $final_path/config/jupyterhub_config.py
|
path=${path_url%/}
|
||||||
# ynh_replace_string --match_string="__URL__" --replace_string="https://$domain" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PATH__" --replace_string="${path_url%/}" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT_HUB__" --replace_string="$port_hub" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__PORT_HTTP_PROXY__" --replace_string="$port_http_proxy" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__FINAL_PATH__" --replace_string="$final_path" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
# ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/config/jupyterhub_config.py"
|
|
||||||
|
|
||||||
# # Recalculate and store the checksum of the file for the next upgrade.
|
|
||||||
# ynh_store_file_checksum --file="$final_path/config/jupyterhub_config.py"
|
|
||||||
|
|
||||||
ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_path/config/jupyterhub_config.py"
|
ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_path/config/jupyterhub_config.py"
|
||||||
|
|
||||||
#ynh_backup_if_checksum_is_different --file="$final_path/config/jupyter_notebook_config.py"
|
|
||||||
|
|
||||||
# cp -f ../conf/jupyter_notebook_config.py $final_path/config/jupyter_notebook_config.py
|
|
||||||
|
|
||||||
# ynh_replace_string --match_string="__ENABLE_TERMINAL__" --replace_string="$enable_terminal" --target_file="$final_path/config/jupyter_notebook_config.py"
|
|
||||||
|
|
||||||
# ynh_store_file_checksum --file="$final_path/config/jupyter_notebook_config.py"
|
|
||||||
|
|
||||||
ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
|
ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -191,7 +171,7 @@ yunohost service add $app --description="$app daemon" --log="$app"
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Starting a systemd service..."
|
ynh_script_progression --message="Starting a systemd service..."
|
||||||
|
|
||||||
ynh_systemd_action --service_name=$app --action="start" --line_match="JupyterHub is now running at" --log_path="systemd"
|
ynh_systemd_action --service_name=$app --action=start --line_match="JupyterHub is now running at" --log_path="systemd"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RELOAD NGINX
|
# RELOAD NGINX
|
||||||
|
|
Loading…
Reference in a new issue