From 892bfb7b00d50c7c8d3dfba4412773072d244d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 22 Dec 2020 09:18:09 +0100 Subject: [PATCH] 1.7.0 (#4) * Upgrde to v.1.7.0 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/change_url | 10 +++++----- scripts/install | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 3162f06..5f8a1d2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview hedgedoc is a real-time collaborative word processing web service. It uses Markdown language. -**Shipped version:** 1.6.0 +**Shipped version:** 1.7.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7bea83d..c9b4da2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble HedgeDoc est un service web de traitement de texte collaboratif en temps réel. Il utilise le langage Markdown. -**Version incluse :** 1.6.0 +**Version incluse :** 1.7.0 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index da1e271..f33e2bc 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/hedgedoc/server/archive/1.6.0.tar.gz -SOURCE_SUM=5cb53b9441817f2e17f998057174f89213c96924d55b444bdaac35d0e48fab03 +SOURCE_URL=https://github.com/hedgedoc/hedgedoc/archive/1.7.0.tar.gz +SOURCE_SUM=22c0c13d215669b4addb54d6b021b79f698f69c897cb2f48363495381055b1a8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 9ad958b..c3f248f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,11 +6,11 @@ "en": "Collaborative editor to work on notes written in Markdown", "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" }, - "version": "1.6.0~ynh6", + "version": "1.7.0~ynh1", "url": "https://github.com/hedgedoc/hedgedoc", "license": "AGPL-3.0-only", "maintainer": { - "name": "" + "name": "eric_G" }, "requirements": { "yunohost": ">= 4.0.0" diff --git a/scripts/_common.sh b/scripts/_common.sh index 327e730..3e0b194 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql apt-transport-https" -nodejs_version=12 +nodejs_version=14 #================================================= # PERSONAL HELPERS diff --git a/scripts/change_url b/scripts/change_url index 16ede2b..9ce2c69 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -82,19 +82,19 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location diff --git a/scripts/install b/scripts/install index 390d925..1b18fb5 100644 --- a/scripts/install +++ b/scripts/install @@ -118,7 +118,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path #============================================== # INSTALL HEDGEDOC #============================================== -ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=10 +ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=20 pushd "$final_path" || ynh_die ynh_use_nodejs @@ -178,7 +178,7 @@ chown -R $app:$app $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description="collaborative Markdown editor" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative Markdown editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 6202cb3..f90d580 100644 --- a/scripts/restore +++ b/scripts/restore @@ -113,7 +113,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description="collaborative Markdown editor" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative Markdown editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index a4f6aad..716e32e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -121,7 +121,7 @@ ynh_system_user_create --username=$app #============================================== if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=10 + ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=20 pushd "$final_path" || ynh_die ynh_use_nodejs @@ -177,7 +177,7 @@ chown -R $app:$app $final_path #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 -yunohost service add $app --description="collaborative Markdown editor" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Collaborative Markdown editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE