From 7e4bb9f6aded16b00b136268a4dd8bfaceb14c96 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 25 Feb 2021 19:50:57 +0100 Subject: [PATCH 1/7] Upgrade to 1.8.10 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 110582e..8c5a4d0 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. together with your friends, fellow students or colleagues, all working on the same document at the same time. -**Shipped version:** 1.8.9 +**Shipped version:** 1.8.10 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e8ed282..ca76076 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst ## Résumé Etherpad vous permet d'éditer des documents de manière collaborative en temps réel, un peu comme un éditeur multi-joueurs en direct qui s'exécute dans votre navigateur. Rédigez des articles, des communiqués de presse, des listes de choses à faire, etc. avec vos amis, camarades ou collègues, tous travaillant sur le même document en même temps. -**Version embarquée :** 1.8.9 +**Version embarquée :** 1.8.10 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 7b0702f..21f5cb6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.9.tar.gz -SOURCE_SUM=8954af79cde7bc8b10b8d0fca6ed772228cf7bacb50af845b235d553bb24a919 +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.10.tar.gz +SOURCE_SUM=8151e7532b2bf956431438be8983d0b8d009c50d8b186026bff07dc3b6a1a84c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index dd6c9ac..0df64ef 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online editor providing collaborative editing in real-time.", "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel." }, - "version": "1.8.9~ynh1", + "version": "1.8.10~ynh1", "url": "https://etherpad.org/", "license": "Apache-2.0", "maintainer": { From 4d252dacbba36a0392144c0595e7b7df4471c934 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 25 Feb 2021 20:40:17 +0100 Subject: [PATCH 2/7] Update check_process --- check_process | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 121054c..89a85f6 100644 --- a/check_process +++ b/check_process @@ -20,6 +20,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=96653aee9379d579a655777ac274355f4afca61c backup_restore=1 multi_instance=1 port_already_use=0 @@ -28,6 +29,6 @@ Email= Notification=none ;;; Upgrade options - ; commit= - name= + ; commit=96653aee9379d579a655777ac274355f4afca61c + name=Merge pull request #6 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=9001& From a8e3a8006feb6e52ef09bf7d1753747059889ddd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Feb 2021 09:06:40 +0100 Subject: [PATCH 3/7] Fix --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/change_url | 2 +- scripts/install | 5 ++--- scripts/upgrade | 5 +++++ 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8c5a4d0..cac9539 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You can access Etherpad's admin panel at `domain.tld/admin`. The configuration f ## Documentation - * Official documentation: http://etherpad.org/doc/v1.8.8 + * Official documentation: http://etherpad.org/doc/v1.8.10 * YunoHost documentation: https://yunohost.org/#/app_etherpad ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index ca76076..5ce9dbd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain ## Documentation - * Documentation officielle : http://etherpad.org/doc/v1.8.8 + * Documentation officielle : http://etherpad.org/doc/v1.8.10 * Documentation YunoHost : https://yunohost.org/#/app_etherpad ## Fonctionnalités spécifiques à YunoHost diff --git a/manifest.json b/manifest.json index 0df64ef..594d1ff 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ diff --git a/scripts/change_url b/scripts/change_url index dc86cc3..c473434 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # MODIFY URL IN NGINX CONF diff --git a/scripts/install b/scripts/install index 795b560..524ec78 100644 --- a/scripts/install +++ b/scripts/install @@ -128,10 +128,9 @@ popd || ynh_die ynh_script_progression --message="Configuring Etherpad..." --weight=60 ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json" -ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" +nh_store_file_checksum --file="$final_path/settings.json" -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/settings.json" +ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" ynh_store_file_checksum --file="$final_path/credentials.json" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 490deb9..6163872 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -127,8 +127,13 @@ ynh_system_user_create --username=$app #================================================= ynh_script_progression --message="Reconfiguring Etherpad..." --weight=6 +ynh_backup_if_checksum_is_different --file="$final_path/settings.json" ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json" +ynh_store_file_checksum --file="$final_path/settings.json" + +ynh_backup_if_checksum_is_different --file="$final_path/credentials.json" ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" +ynh_store_file_checksum --file="$final_path/credentials.json" #================================================= # INSTALL ETHERPAD From 9c7531602b1417a45701ea4d1596102d3622cf21 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Feb 2021 18:20:51 +0100 Subject: [PATCH 4/7] Small fixes --- scripts/install | 1 - scripts/upgrade | 1 - 2 files changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 524ec78..27ae7ec 100644 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 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=admin --value=$admin -ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=password --value=$password diff --git a/scripts/upgrade b/scripts/upgrade index 6163872..8bc0dd9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) port=$(ynh_app_setting_get --app=$app --key=port) From 0930d9d9e519a14a4e769dca1414ff656eb19142 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 27 Feb 2021 18:57:38 +0100 Subject: [PATCH 5/7] Upgrade to version 1.8.11 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cac9539..d91e69a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. together with your friends, fellow students or colleagues, all working on the same document at the same time. -**Shipped version:** 1.8.10 +**Shipped version:** 1.8.11 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 5ce9dbd..9e5ea54 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst ## Résumé Etherpad vous permet d'éditer des documents de manière collaborative en temps réel, un peu comme un éditeur multi-joueurs en direct qui s'exécute dans votre navigateur. Rédigez des articles, des communiqués de presse, des listes de choses à faire, etc. avec vos amis, camarades ou collègues, tous travaillant sur le même document en même temps. -**Version embarquée :** 1.8.10 +**Version embarquée :** 1.8.11 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 21f5cb6..e37d405 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.10.tar.gz -SOURCE_SUM=8151e7532b2bf956431438be8983d0b8d009c50d8b186026bff07dc3b6a1a84c +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.11.tar.gz +SOURCE_SUM=b9b9916d8e1b1ebe6dac5ebc0f24fa1ea064ddfd1307919bef2b58d7a8d5339c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 594d1ff..4fe4331 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online editor providing collaborative editing in real-time.", "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel." }, - "version": "1.8.10~ynh1", + "version": "1.8.11~ynh1", "url": "https://etherpad.org/", "license": "Apache-2.0", "maintainer": { From 43003817efe8341656934265c52f6aa61f25fb85 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 27 Feb 2021 18:58:57 +0100 Subject: [PATCH 6/7] Update settings.json --- conf/settings.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index 906af3c..a994259 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -535,9 +535,7 @@ */ "logconfig" : { "appenders": [ - { "type": "console" - //, "category": "access"// only logs pad access - } + { "type": "console"} /* , { "type": "file" From 62ca38b6dcd600a2000a0742e921483bea0f1f7f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 27 Feb 2021 19:53:19 +0100 Subject: [PATCH 7/7] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 27ae7ec..e4c375a 100644 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ popd || ynh_die ynh_script_progression --message="Configuring Etherpad..." --weight=60 ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json" -nh_store_file_checksum --file="$final_path/settings.json" +ynh_store_file_checksum --file="$final_path/settings.json" ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" ynh_store_file_checksum --file="$final_path/credentials.json"