From 8c052e358a45ee64fe7728a9325af405c1f4ddc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 3 Jan 2021 09:31:15 +0100 Subject: [PATCH] Testing (#11) 1.7.1 release tarball includes the frontend. --- README.md | 3 ++- README_fr.md | 3 ++- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 3 +-- scripts/restore | 2 +- scripts/upgrade | 3 +-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5f7ac87..3d487fe 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,8 @@ HedgeDoc is a real-time collaborative word processing web service. It uses Markd ## Configuration -You can configure HedgeDoc by editing this file `/var/www/hedgedoc/config.json` using the [documentation](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md) +You can configure HedgeDoc by editing this file `/var/www/hedgedoc/config.json` using the [documentation](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md) +When you finished editing the configuration, for your changes to take effect, you will have to run: `sudo systemctl restart hedgedoc`. ## Documentation diff --git a/README_fr.md b/README_fr.md index e1e9bc2..69ea9d4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,8 @@ HedgeDoc est un service web de traitement de texte collaboratif en temps réel. ## Configuration -Vous pouvez configurer HedgeDoc en modifiant le fichier `/var/www/hedgedoc/config.json` et en vous aidant de la [documentation](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md) +Vous pouvez configurer HedgeDoc en modifiant le fichier `/var/www/hedgedoc/config.json` et en vous aidant de la [documentation](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md) +Lorsque vous avez terminé de modifier la configuration, pour que vos modifications prennent effet, vous devrez exécuter : `sudo systemctl restart hedgedoc`. ## Documentation diff --git a/conf/app.src b/conf/app.src index e92e97a..7eea66d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/hedgedoc/hedgedoc/archive/1.7.1.tar.gz -SOURCE_SUM=6941dc631dca0fbb42de5c0379f5b5eab0cd2e0084ed1edeb431d53f4a38a55a +SOURCE_URL=https://github.com/hedgedoc/hedgedoc/releases/download/1.7.1/hedgedoc-1.7.1.tar.gz +SOURCE_SUM=17e7092430b36c96059309fdd03f9244f6a13611e28ced153d9dbf97e109d5ba SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 4f98517..894ac27 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.7.1~ynh1", + "version": "1.7.1~ynh2", "url": "https://github.com/hedgedoc/hedgedoc", "license": "AGPL-3.0-only", "maintainer": { diff --git a/scripts/install b/scripts/install index 1b18fb5..5d7cc84 100644 --- a/scripts/install +++ b/scripts/install @@ -65,7 +65,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." --weight=20 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version @@ -123,7 +123,6 @@ ynh_script_progression --message="Building HedgeDoc... (this will take some time pushd "$final_path" || ynh_die ynh_use_nodejs bin/setup - ynh_exec_warn_less yarn run build popd || ynh_die #================================================= diff --git a/scripts/restore b/scripts/restore index f90d580..b465605 100644 --- a/scripts/restore +++ b/scripts/restore @@ -83,7 +83,7 @@ chown -R $app:$app $final_path ynh_script_progression --message="Reinstalling dependencies..." --weight=6 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version diff --git a/scripts/upgrade b/scripts/upgrade index 716e32e..23093be 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=10 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version @@ -126,7 +126,6 @@ then pushd "$final_path" || ynh_die ynh_use_nodejs bin/setup - ynh_exec_warn_less yarn run build popd || ynh_die fi