diff --git a/README.md b/README.md index b0a94b2..23b27c2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Collaborative editor to work on notes written in Markdown -**Shipped version:** 1.9.0~ynh1 +**Shipped version:** 1.9.1~ynh1 **Demo:** https://demo.hedgedoc.org/ diff --git a/README_fr.md b/README_fr.md index 500f2a8..d0604d2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Éditeur collaboratif pour travailler sur des notes en Markdown -**Version incluse :** 1.9.0~ynh1 +**Version incluse :** 1.9.1~ynh1 **Démo :** https://demo.hedgedoc.org/ diff --git a/conf/app.src b/conf/app.src index cb9c92b..6e3402c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/hedgedoc/hedgedoc/releases/download/1.9.0/hedgedoc-1.9.0.tar.gz -SOURCE_SUM=976d908ea81025e72277d2815fd51ccf462c09d10451c16893b187d95f21e837 +SOURCE_URL=https://github.com/hedgedoc/hedgedoc/releases/download/1.9.1/hedgedoc-1.9.1.tar.gz +SOURCE_SUM=19a92d2ad4354e0975be980d375cb1a53a575e54cab89cb54ea2f042b6126ed6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/nginx.conf b/conf/nginx.conf index a0fc0ae..ab4eec6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ location ^~ __PATH__/ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__/; proxy_redirect off; proxy_set_header Host $host; diff --git a/manifest.json b/manifest.json index 63e264f..6082872 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Collaborative editor to work on notes written in Markdown", "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" }, - "version": "1.9.0~ynh1", + "version": "1.9.1~ynh1", "url": "https://hedgedoc.org", "upstream": { "license": "free", @@ -20,7 +20,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 3e0b194..dc486ee 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=14 +nodejs_version=16 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 7c328f7..ada5c47 100644 --- a/scripts/install +++ b/scripts/install @@ -114,10 +114,10 @@ ynh_add_nginx_config #============================================== ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=20 -pushd "$final_path" || ynh_die +pushd "$final_path" ynh_use_nodejs bin/setup -popd || ynh_die +popd #================================================= # SETUP SYSTEMD diff --git a/scripts/restore b/scripts/restore index 9d7210e..86f21a9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,8 +38,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index a70d5f3..96f7520 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." --weight=2 upgrade_type=$(ynh_check_app_version_changed) @@ -116,10 +115,10 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=20 - pushd "$final_path" || ynh_die + pushd "$final_path" ynh_use_nodejs bin/setup - popd || ynh_die + popd fi #=================================================