diff --git a/scripts/backup b/scripts/backup index 57d4973..557e38d 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,17 +19,17 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= +ynh_print_info --message="Backing up $app..." app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get $app final_path) -config_path=$(ynh_app_setting_get $app config_path) -domain=$(ynh_app_setting_get $app domain) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +config_path=$(ynh_app_setting_get --app=$app --key=config_path) +domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_print_info --message="Backing up $app..." ynh_backup --src_path="$final_path" diff --git a/scripts/change_url b/scripts/change_url index 5a4817e..30768ab 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -91,7 +91,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index efe74e3..645f535 100644 --- a/scripts/install +++ b/scripts/install @@ -36,9 +36,8 @@ ynh_script_progression --message="Validating installation parameters..." final_path=/var/www/$app config_path=/home/yunohost.app/$app/ -test ! -e "$final_path" || ynh_die "This path already contains a folder" -ynh_app_setting_set --app="$app" --key="config_path" --value="$config_path" +test ! -e "$final_path" || ynh_die "This path already contains a folder" # Normalize the url path syntax path_url=$(ynh_normalize_url_path $path_url) @@ -49,17 +48,6 @@ ynh_webpath_available "$domain" "$path_url" # Register (book) web path ynh_webpath_register "$app" "$domain" "$path_url" -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." - -ynh_app_setting_set --app="$app" --key="domain" --value="$domain" -ynh_app_setting_set --app="$app" --key="path" --value="$path_url" -ynh_app_setting_set --app="$app" --key="is_public" --value="$is_public" - -#================================================= -# STANDARD MODIFICATIONS #================================================= # FIND AND OPEN A PORT #================================================= @@ -70,6 +58,17 @@ port=$(ynh_find_port 9000) ynh_app_setting_set --app="$app" --key="port" --value="$port" +#================================================= +# STORE SETTINGS FROM MANIFEST +#================================================= +ynh_script_progression --message="Storing installation settings..." + +ynh_app_setting_set --app="$app" --key="domain" --value="$domain" +ynh_app_setting_set --app="$app" --key="path" --value="$path_url" +ynh_app_setting_set --app="$app" --key="is_public" --value="$is_public" +ynh_app_setting_set --app="$app" --key="final_path" --value="$final_path" +ynh_app_setting_set --app="$app" --key="config_path" --value="$config_path" + #================================================= # INSTALL DEPENDENCIES #================================================= @@ -81,18 +80,14 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" # Install Yarn ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" -#============================================== - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +mkdir -p "$final_path" -mkdir -p $final_path - -mkdir -p $config_path +mkdir -p "$config_path" # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" @@ -106,25 +101,19 @@ ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_f cp -a ../conf/config.js "$config_path" +ynh_store_file_checksum "$config_path/config.js" + #================================================= # INSTALL THE LOUNGE #================================================= ynh_script_progression --message="Installing The Lounge..." -pushd $final_path +pushd "$final_path" yarn install && ynh_exec_warn_less NODE_ENV=production yarn build popd -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring nginx web server..." - -# Create a dedicated nginx config -ynh_add_nginx_config - #================================================= # CREATE DEDICATED USER #================================================= @@ -133,6 +122,14 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create "$app" +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring nginx web server..." + +# Create a dedicated nginx config +ynh_add_nginx_config + #================================================= # SETUP SYSTEMD #================================================= @@ -145,12 +142,7 @@ ynh_replace_string --match_string="__NODE__" --replace_string="$nodejs_path ynh_add_systemd_config -#================================================= -# STORE THE CHECKSUM OF THE CONFIG FILE -#================================================= - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum "$config_path/config.js" +yunohost service add "$app" --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION @@ -170,19 +162,13 @@ ynh_script_progression --message="Configuring log rotation..." # Use logrotate to manage application logfile(s) ynh_use_logrotate -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= - -yunohost service add "$app" --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" #================================================= # SETUP SSOWAT @@ -190,11 +176,14 @@ ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$ ynh_script_progression --message="Configuring SSOwat..." # Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app="$app" --key=unprotected_uris --value="/" -fi +#if [ $is_public -eq 1 ] +#then +# # unprotected_uris allows SSO credentials to be passed anyway. +# ynh_app_setting_set --app="$app" --key=unprotected_uris --value="/" +#fi + +# Make app public if necessary or protect it +[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors" #================================================= # RELOAD NGINX diff --git a/scripts/remove b/scripts/remove index 22084c9..07f3894 100644 --- a/scripts/remove +++ b/scripts/remove @@ -19,7 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -config_path=$(ynh_app_setting_get --app=$app --key=config_path --value=$config_path) +config_path=$(ynh_app_setting_get --app=$app --key=config_path) #================================================= # STANDARD REMOVE @@ -47,7 +47,7 @@ ynh_remove_systemd_config #================================================= ynh_script_progression --message="Removing dependencies..." -# Remove metapackage and its dependencies +# Remove NodeJS ynh_remove_nodejs #================================================= diff --git a/scripts/restore b/scripts/restore index e1f5650..0388215 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,10 +27,10 @@ ynh_script_progression --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -path_url=$(ynh_app_setting_get $app path) -final_path=$(ynh_app_setting_get $app final_path) -config_path=$(ynh_app_setting_get $app config_path) +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +config_path=$(ynh_app_setting_get --app=$app --key=config_path) #================================================= # CHECK IF THE APP CAN BE RESTORED diff --git a/scripts/upgrade b/scripts/upgrade index 6374699..4aef1a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,12 +16,12 @@ ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -path_url=$(ynh_app_setting_get $app path) -is_public=$(ynh_app_setting_get $app is_public) -final_path=$(ynh_app_setting_get $app final_path) -config_path=$(ynh_app_setting_get $app config_path) -port=$(ynh_app_setting_get $app port) +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +is_public=$(ynh_app_setting_get --app=$app --key=is_public) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +config_path=$(ynh_app_setting_get --app=$app --key=config_path) +port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # CHECK VERSION @@ -83,7 +83,7 @@ path_url=$(ynh_normalize_url_path $path_url) #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -125,7 +125,7 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st if [ "$upgrade_type" == "UPGRADE_APP" ] then - pushd $final_path + pushd "$final_path" yarn install && ynh_exec_warn_less NODE_ENV=production yarn build @@ -160,6 +160,8 @@ ynh_replace_string --match_string="__NODE__" --replace_string="$nodejs_path ynh_add_systemd_config +yunohost service add "$app" --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log" + #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= @@ -191,18 +193,12 @@ ynh_use_logrotate --non-append chown -R "$app": "$final_path" chown -R "$app": "$config_path" -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= - -yunohost service add "$app" --description "Self-hosted web IRC client" --log "/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" #================================================= # RELOAD NGINX