From 43757f9f11c6a7e1c959dd7a86e3435a0585ecf4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 20 Aug 2021 01:18:14 +0200 Subject: [PATCH 1/7] Upgrade to 1.3.0~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++++ conf/app.src | 6 +++--- doc/DISCLAIMER.md | 2 +- manifest.json | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index af5b558..fc78fe2 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 A decentralized and federated platform to organize events -**Shipped version:** 1.2.3~ynh1 +**Shipped version:** 1.3.0~ynh1 **Demo:** https://demo.mobilizon.org diff --git a/README_fr.md b/README_fr.md index a5ae8fc..252ce6c 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 Une plateforme décentralisée et fédérée pour organiser des événements -**Version incluse :** 1.2.3~ynh1 +**Version incluse :** 1.3.0~ynh1 **Démo :** https://demo.mobilizon.org diff --git a/check_process b/check_process index 3786210..42717d5 100644 --- a/check_process +++ b/check_process @@ -20,6 +20,8 @@ upgrade=1 from_commit=215b20b0d35178a2c3405a7e3239eba81e22c060 # 1.2.2~ynh1 upgrade=1 from_commit=b63c7833f80de56bbc4a255ddda3b865a5637afc + # 1.2.3~ynh1 + upgrade=1 from_commit=42d479d2cc5bcdc40806ac01802d8eac9df5b2ea backup_restore=1 multi_instance=1 port_already_use=0 @@ -34,3 +36,5 @@ Notification=all name=1.1.4~ynh1 ; commit=b63c7833f80de56bbc4a255ddda3b865a5637afc name=1.2.2~ynh1 + ; commit=42d479d2cc5bcdc40806ac01802d8eac9df5b2ea + name=1.2.3~ynh1 diff --git a/conf/app.src b/conf/app.src index 77d6c31..fed57a4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.2.3/mobilizon-1.2.3.tar.gz -SOURCE_SUM=4025bf5cee811987b0bf55b1dac88621544d3d2bcd1b02100049e9f63bafb8ad +SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.3.0/mobilizon-1.3.0.tar.gz +SOURCE_SUM=b4488644919d42a8183eeeb4a0a32bbc925bbbad01c6f09aa2f4882d03a0d7f1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mobilizon-1.2.3.tar.gz +SOURCE_FILENAME=mobilizon-1.3.0.tar.gz SOURCE_EXTRACT=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 7016c78..338585a 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -5,4 +5,4 @@ * All YunoHost users are allowed to connect * Other infos that people should be aware of, such as: - * Configuration can be made in the Mobilizon administration panel. \ No newline at end of file + * Configuration can be made in the Mobilizon administration panel. diff --git a/manifest.json b/manifest.json index b1a2c81..55f7ccd 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "1.2.3~ynh1", + "version": "1.3.0~ynh1", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", From 0ce9c0a3ecf16f0669e8d807e85041aa2199c1b1 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 19 Aug 2021 23:18:18 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index fc78fe2..8532ebe 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ A decentralized and federated platform to organize events * Other infos that people should be aware of, such as: * Configuration can be made in the Mobilizon administration panel. + ## Documentation and resources * Official app website: https://joinmobilizon.org/ diff --git a/README_fr.md b/README_fr.md index 252ce6c..ca852d3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,6 +31,7 @@ Une plateforme décentralisée et fédérée pour organiser des événements * Other infos that people should be aware of, such as: * Configuration can be made in the Mobilizon administration panel. + ## Documentations et ressources * Site officiel de l'app : https://joinmobilizon.org/ From 396458b77bea12fc8d171bf1c2f015208c1c23bf Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 20 Aug 2021 19:08:07 +0200 Subject: [PATCH 3/7] Upgrade to 1.3.1 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index fed57a4..38adeb7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.3.0/mobilizon-1.3.0.tar.gz -SOURCE_SUM=b4488644919d42a8183eeeb4a0a32bbc925bbbad01c6f09aa2f4882d03a0d7f1 +SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.3.1/mobilizon-1.3.1.tar.gz +SOURCE_SUM=e64680612020aab4323b198f5b63b7e4845b73c6f4b4370c94ce90270f19bb28 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mobilizon-1.3.0.tar.gz +SOURCE_FILENAME=mobilizon-1.3.1.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 55f7ccd..7e537b9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "1.3.0~ynh1", + "version": "1.3.1~ynh1", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", From 5c0dc869b14f748d1b4ef63ddbadcf648d72aebb Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 20 Aug 2021 17:08:12 +0000 Subject: [PATCH 4/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8532ebe..7457d18 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 A decentralized and federated platform to organize events -**Shipped version:** 1.3.0~ynh1 +**Shipped version:** 1.3.1~ynh1 **Demo:** https://demo.mobilizon.org diff --git a/README_fr.md b/README_fr.md index ca852d3..3b155f8 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 Une plateforme décentralisée et fédérée pour organiser des événements -**Version incluse :** 1.3.0~ynh1 +**Version incluse :** 1.3.1~ynh1 **Démo :** https://demo.mobilizon.org From b6fc6445b89177be65226e596c247c5a2907beb1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 22 Aug 2021 13:57:54 +0200 Subject: [PATCH 5/7] Fix upgrade --- scripts/upgrade | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 919d092..3d29fa8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -154,13 +154,6 @@ if [ -z "$datadir" ]; then ynh_secure_remove --file="$final_path/$app/uploads" fi -if [ ! -f "$final_path/$app/config/runtime.exs" ]; then - ynh_delete_file_checksum --file="$final_path/$app/config/prod.secret.exs" - mv "$final_path/$app/config/prod.secret.exs" "$final_path/$app/config/runtime.exs" - ynh_replace_string --match_string="server: true," --replace_string="" --target_file="$final_path/$app/config/runtime.exs" - ynh_store_file_checksum --file="$final_path/$app/config/runtime.exs" -fi - if ynh_version_gt "1.2.3~ynh1" "${previous_version}" ; then ynh_script_progression --message="Upgrade to 1.2.3~ynh1..." ynh_delete_file_checksum --file="$final_path/$app/config/runtime.exs" @@ -168,6 +161,14 @@ if ynh_version_gt "1.2.3~ynh1" "${previous_version}" ; then ynh_store_file_checksum --file="$final_path/live/config/runtime.exs" fi +if [ ! -f "$final_path/live/config/runtime.exs" ]; then + ynh_delete_file_checksum --file="$final_path/$app/config/prod.secret.exs" + ynh_delete_file_checksum --file="$final_path/live/config/prod.secret.exs" + mv "$final_path/live/config/prod.secret.exs" "$final_path/live/config/runtime.exs" + ynh_replace_string --match_string="server: true," --replace_string="" --target_file="$final_path/live/config/runtime.exs" + ynh_store_file_checksum --file="$final_path/live/config/runtime.exs" +fi + #================================================= # CREATE DEDICATED USER #================================================= From 235ee506c9882e6060a224576650f1797645f2c9 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 23 Aug 2021 20:51:19 +0200 Subject: [PATCH 6/7] Upgrade to 1.3.2 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 6 +++--- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7457d18..b90679a 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 A decentralized and federated platform to organize events -**Shipped version:** 1.3.1~ynh1 +**Shipped version:** 1.3.2~ynh1 **Demo:** https://demo.mobilizon.org diff --git a/README_fr.md b/README_fr.md index 3b155f8..f9561a9 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 Une plateforme décentralisée et fédérée pour organiser des événements -**Version incluse :** 1.3.1~ynh1 +**Version incluse :** 1.3.2~ynh1 **Démo :** https://demo.mobilizon.org diff --git a/conf/app.src b/conf/app.src index 38adeb7..682b8a7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.3.1/mobilizon-1.3.1.tar.gz -SOURCE_SUM=e64680612020aab4323b198f5b63b7e4845b73c6f4b4370c94ce90270f19bb28 +SOURCE_URL=https://framagit.org/framasoft/mobilizon/-/archive/1.3.2/mobilizon-1.3.2.tar.gz +SOURCE_SUM=74af9537ddd3ab4f549ee67e6e9b9b67946cf687c6f325b53947741348105e0a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mobilizon-1.3.1.tar.gz +SOURCE_FILENAME=mobilizon-1.3.2.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 7e537b9..fcdb787 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "1.3.1~ynh1", + "version": "1.3.2~ynh1", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", From 68eb1f58f60577bebf6c7ead1b5626e748b5feee Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 24 Aug 2021 23:31:11 +0200 Subject: [PATCH 7/7] Less warnings --- scripts/install | 6 +++--- scripts/restore | 2 +- scripts/upgrade | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 369b635..7782765 100644 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION @@ -163,9 +163,9 @@ config="$final_path/live/config/runtime.exs" pushd $final_path/live/js ynh_use_nodejs ynh_script_progression --message="Installing NodeJS dependencies (this is going to take a while...)" - sudo -u $app env PATH=$PATH yarn install + ynh_exec_warn_less sudo -u $app env PATH=$PATH yarn install ynh_script_progression --message="Building NodeJS application (this is going to take a while...)" - sudo -u $app env PATH=$PATH NODE_BUILD_MEMORY=1024 yarn run build + ynh_exec_warn_less sudo -u $app env PATH=$PATH NODE_BUILD_MEMORY=1024 yarn run build popd ynh_secure_remove --file="$final_path/live/js" diff --git a/scripts/restore b/scripts/restore index a446d90..61f45e7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -101,7 +101,7 @@ chown -R $app:$app "$datadir" ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION diff --git a/scripts/upgrade b/scripts/upgrade index 3d29fa8..d247b07 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -221,7 +221,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION @@ -263,9 +263,9 @@ chown -R $app:$app "$datadir" pushd $final_path/live/js ynh_use_nodejs ynh_script_progression --message="Installing NodeJS dependencies (this is going to take a while...)" - sudo -u $app env PATH=$PATH yarn install + ynh_exec_warn_less sudo -u $app env PATH=$PATH yarn install ynh_script_progression --message="Building NodeJS application (this is going to take a while...)" - sudo -u $app env PATH=$PATH NODE_BUILD_MEMORY=1024 yarn run build + ynh_exec_warn_less sudo -u $app env PATH=$PATH NODE_BUILD_MEMORY=1024 yarn run build sudo -u $app env PATH=$PATH yarn cache clean --all popd