From ecdc09d1a40eeb56ba3c98798c787f10a641f770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:41:50 +0200 Subject: [PATCH 01/15] cleaning --- manifest.toml | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 26ba003..4f18c57 100644 --- a/manifest.toml +++ b/manifest.toml @@ -50,7 +50,7 @@ ram.runtime = "50M" ask.fr = "Choisissez la langue de l'application" type = "select" choices = ["ca", "de", "en", "es", "fr", "gl", "hu", "it", "nl", "pt"] - default = "en" + default = "fr" [install.admin] type = "user" diff --git a/scripts/install b/scripts/install index 184ac85..565794e 100644 --- a/scripts/install +++ b/scripts/install @@ -39,7 +39,7 @@ chown -R $app:www-data "$install_dir" #================================================= # INSTALL ETHERPAD #================================================= -ynh_script_progression --message="Installing $app..." --weight=60 +ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs From 17aa089e78f760de7f42137fd04a32510f6a4638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 Dec 2023 14:57:15 +0100 Subject: [PATCH 02/15] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 4f18c57..fc7c73a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/ether/etherpad-lite" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = true + disk = "50M" ram.build = "2G" ram.runtime = "50M" From 16051b2c6a1174fa81c902923241ab4deefb85ab Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 Dec 2023 13:57:20 +0000 Subject: [PATCH 03/15] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c197739..e1d2b5e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented. If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Shipped version:** 1.9.3~ynh1 +**Shipped version:** 1.9.4~ynh1 **Demo:** https://video.etherpad.com/ @@ -35,7 +35,7 @@ If you want to install Etherpad with plugins and mysql database: https://github. * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 1473945..f3a81e1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Version incluse :** 1.9.3~ynh1 +**Version incluse :** 1.9.4~ynh1 **Démo :** https://video.etherpad.com/ @@ -35,7 +35,7 @@ Si vous souhaitez installer Etherpad avec les plugins et la base de données mys * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 69a8b0e94112aaec5143b65d22e29bbc834a7ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 Dec 2023 14:57:47 +0100 Subject: [PATCH 04/15] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 565794e..3be5504 100644 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ popd #================================================= ynh_script_progression --message="Configuring $app..." --weight=6 -ynh_add_config --template="../conf/settings.json" --destination="$install_dir/settings.json" +ynh_add_config --template="settings.json" --destination="$install_dir/settings.json" chmod 400 "$install_dir/settings.json" chown $app:$app "$install_dir/settings.json" @@ -70,7 +70,7 @@ then fi ynh_store_file_checksum --file="$install_dir/settings.json" -ynh_add_config --template="../conf/credentials.json" --destination="$install_dir/credentials.json" +ynh_add_config --template="credentials.json" --destination="$install_dir/credentials.json" chmod 400 "$install_dir/credentials.json" chown $app:$app "$install_dir/credentials.json" From b77a139202ffe405b74803cf91c2bfd68820ce9c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Dec 2023 07:36:02 +0100 Subject: [PATCH 05/15] Update systemd.service --- conf/systemd.service | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 200bb15..e419287 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,12 +1,13 @@ [Unit] Description=Etherpad-lite: collaborative editor -After=syslog.target network.target postgresql.service +After=syslog.target network.target [Service] Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=__INSTALL_DIR__ +WorkingDirectory=__INSTALL_DIR__/ +Environment=ETHERPAD_PRODUCTION=true Environment="NODE_ENV=production" Environment="__YNH_NODE_LOAD_PATH__" ExecStart=__INSTALL_DIR__/src/bin/run.sh From c441f66905b118aa4a7de9c3b39f9ea6ba071be6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Dec 2023 07:36:54 +0100 Subject: [PATCH 06/15] Update credentials.json --- conf/credentials.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/credentials.json b/conf/credentials.json index 64ef848..5655057 100644 --- a/conf/credentials.json +++ b/conf/credentials.json @@ -40,6 +40,8 @@ "users": { "__ADMIN__": { + // 1) "password" can be replaced with "hash" if you install ep_hash_auth + // 2) please note that if password is null, the user will not be created "password": "__PASSWORD__", "is_admin": true } From af75ec924e42b08e1a3c20545a03a676ea9ebd6f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Dec 2023 07:52:21 +0100 Subject: [PATCH 07/15] fix --- scripts/install | 73 ++++++++++++++++++++++++------------------------- scripts/restore | 7 ++++- scripts/upgrade | 27 +++++++++++++++++- tests.toml | 13 ++++++++- 4 files changed, 79 insertions(+), 41 deletions(-) diff --git a/scripts/install b/scripts/install index 3be5504..e9b6737 100644 --- a/scripts/install +++ b/scripts/install @@ -36,44 +36,6 @@ ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# INSTALL ETHERPAD -#================================================= -ynh_script_progression --message="Installing $app..." --weight=10 - -pushd $install_dir - ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH src/bin/installDeps.sh -popd - -#================================================= -# MODIFY A CONFIG FILE -#================================================= -ynh_script_progression --message="Configuring $app..." --weight=6 - -ynh_add_config --template="settings.json" --destination="$install_dir/settings.json" -chmod 400 "$install_dir/settings.json" -chown $app:$app "$install_dir/settings.json" - -if [ "$export" = "abiword" ] -then - # Get AbiWord binary path - abiword_path=`which abiword` - # Set the path of AbiWord into Etherpad config - ynh_replace_string --match_string="\"abiword\" : null" --replace_string="\"abiword\" : \"$abiword_path\"" --target_file="$install_dir/settings.json" -elif [ "$export" = "libreoffice" ] -then - # Get soffice binary path - soffice_path=`which soffice` - # Set the path of soffice into Etherpad config - ynh_replace_string --match_string="\"soffice\" : null" --replace_string="\"soffice\" : \"$soffice_path\"" --target_file="$install_dir/settings.json" -fi -ynh_store_file_checksum --file="$install_dir/settings.json" - -ynh_add_config --template="credentials.json" --destination="$install_dir/credentials.json" -chmod 400 "$install_dir/credentials.json" -chown $app:$app "$install_dir/credentials.json" - #================================================= # SETUP SYSTEMD #================================================= @@ -90,6 +52,41 @@ ynh_use_logrotate yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log" +#================================================= +# MODIFY A CONFIG FILE +#================================================= +ynh_script_progression --message="Configuring $app..." --weight=6 + +abiword_path="null" +soffice_path="null" + +if [[ "$export" == "abiword" ]] +then + abiword_path="\"$(which abiword)\"" +elif [[ "$export" == "libreoffice" ]] +then + soffice_path="\"$(which soffice)\"" +fi + +ynh_add_config --template="settings.json" --destination="$install_dir/settings.json" +ynh_add_config --template="credentials.json" --destination="$install_dir/credentials.json" + +chmod 600 "$install_dir/settings.json" +chown $app:$app "$install_dir/settings.json" + +chmod 600 "$install_dir/credentials.json" +chown $app:$app "$install_dir/credentials.json" + +#================================================= +# INSTALL ETHERPAD +#================================================= +ynh_script_progression --message="Installing $app..." --weight=10 + +pushd $install_dir + ynh_use_nodejs + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh +popd + #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/restore b/scripts/restore index b132b8c..4f52a8f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,7 +19,12 @@ ynh_restore_file --origin_path="$install_dir" # Restore permissions on app files chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -chmod 400 $install_dir/credentials.json + +chmod 600 "$install_dir/settings.json" +chown $app:$app "$install_dir/settings.json" + +chmod 600 "$install_dir/credentials.json" +chown $app:$app "$install_dir/credentials.json" #================================================= # REINSTALL DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index 5ce9018..b529dbf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,6 +56,31 @@ ynh_use_logrotate --non-append yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log" +#================================================= +# CONFIGURE ETHERPAD +#================================================= +ynh_script_progression --message="Configure $app..." --weight=3 + +abiword_path="null" +soffice_path="null" + +if [[ "$export" == "abiword" ]] +then + abiword_path="\"$(which abiword)\"" +elif [[ "$export" == "libreoffice" ]] +then + soffice_path="\"$(which soffice)\"" +fi + +ynh_add_config --template="settings.json" --destination="$install_dir/settings.json" +ynh_add_config --template="credentials.json" --destination="$install_dir/credentials.json" + +chmod 600 "$install_dir/settings.json" +chown $app:$app "$install_dir/settings.json" + +chmod 600 "$install_dir/credentials.json" +chown $app:$app "$install_dir/credentials.json" + #================================================= # INSTALL ETHERPAD #================================================= @@ -63,7 +88,7 @@ ynh_script_progression --message="Installing $app..." --weight=90 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH src/bin/installDeps.sh + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh popd #================================================= diff --git a/tests.toml b/tests.toml index ab97358..412e10e 100644 --- a/tests.toml +++ b/tests.toml @@ -6,4 +6,15 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - #test_upgrade_from.96653aee9379d579a655777ac274355f4afca61c.name = "Upgrade from 5.4" \ No newline at end of file + args.export = "none" + args.password = "##SuperAdminPassword##" + + #test_upgrade_from.96653aee9379d579a655777ac274355f4afca61c.name = "Upgrade from 5.4" + + [with_abiword] + args.export = "abiword" + only = ["install.root"] + + [with_libreoffice] + args.export = "libreoffice" + only = ["install.root"] \ No newline at end of file From 51623e824c4cea2c2a270001395e1a2b95883f45 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Dec 2023 07:56:31 +0100 Subject: [PATCH 08/15] cleaning --- scripts/change_url | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 6898805..d1340cf 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -32,7 +32,7 @@ ynh_script_progression --message="Starting a systemd service..." --weight=6 # Start a systemd service ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is" -sleep 120 +sleep 60 #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index e9b6737..ea12af5 100644 --- a/scripts/install +++ b/scripts/install @@ -84,7 +84,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b529dbf..9305967 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -88,7 +88,7 @@ ynh_script_progression --message="Installing $app..." --weight=90 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh popd #================================================= From bc87f06ee95aec6ab13b6e56a87b15419ad73d74 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Dec 2023 11:48:11 +0100 Subject: [PATCH 09/15] Update upgrade --- scripts/upgrade | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 9305967..4d67b12 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,32 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=42 ynh_systemd_action --service_name=$app --action=stop --log_path="systemd" +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 + +if [ -z "${language:-}" ]; then + # If upgrading from a version which doesn't support translations, set language to English by default + language=en + ynh_app_setting_set --app=$app --key=language --value=$language +fi + +if [ -z "${export:-}" ]; then + export=none + ynh_app_setting_set --app=$app --key=export --value=$export +fi + +if [ -z "${path:-}" ]; then + path="/" + ynh_app_setting_set --app=$app --key=path --value=$path +fi + +if [ -z "${password:-}" ]; then + password=$(ynh_string_random --length=32) + ynh_app_setting_set --app=$app --key=password --value="$password" +fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From c0303c06f1122ce842e590db2d686d943830fd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:43:18 +0100 Subject: [PATCH 10/15] cleaning --- scripts/change_url | 1 - scripts/restore | 1 - 2 files changed, 2 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index d1340cf..3f4d2ab 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -32,7 +32,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=6 # Start a systemd service ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is" -sleep 60 #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 4f52a8f..d83404d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -54,7 +54,6 @@ yunohost service add $app --description="Collaborative editor" --log="/var/log/$ ynh_script_progression --message="Starting a systemd service..." --weight=8 ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is" -sleep 60 ynh_systemd_action --service_name=nginx --action=reload From 90d049cd6e4f1f9c822bc73b85eeb9c4400abeae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Dec 2023 10:44:36 +0100 Subject: [PATCH 11/15] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index fc7c73a..2c0f395 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.9.4~ynh1" +version = "1.9.5~ynh1" maintainers = ["eric_G"] @@ -63,8 +63,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/refs/tags/v1.9.4.tar.gz" - sha256 = "5b8ccf2a3c92cbd9bb578f684bc52d2ea27fc3fb30cdc76341f9ccffe0c0ff7f" + url = "https://github.com/ether/etherpad-lite/archive/refs/tags/v1.9.5.tar.gz" + sha256 = "7f9a93370a9e2d900b64273c369cbb195bfc3747664b7632da9c1549c03f4407" autoupdate.strategy = "latest_github_tag" [resources.ports] From a0e784723f771c75a3f9fe827349e66c07066028 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 23 Dec 2023 09:44:41 +0000 Subject: [PATCH 12/15] 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 e1d2b5e..3c3db7c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented. If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Shipped version:** 1.9.4~ynh1 +**Shipped version:** 1.9.5~ynh1 **Demo:** https://video.etherpad.com/ diff --git a/README_fr.md b/README_fr.md index f3a81e1..a87e2c6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Version incluse :** 1.9.4~ynh1 +**Version incluse :** 1.9.5~ynh1 **Démo :** https://video.etherpad.com/ From af793a75178cd1e1038fe52834f8afc59e1e32b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 24 Dec 2023 20:41:33 +0100 Subject: [PATCH 13/15] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2c0f395..de4a0e7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.9.5~ynh1" +version = "1.9.6~ynh1" maintainers = ["eric_G"] @@ -63,8 +63,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/refs/tags/v1.9.5.tar.gz" - sha256 = "7f9a93370a9e2d900b64273c369cbb195bfc3747664b7632da9c1549c03f4407" + url = "https://github.com/ether/etherpad-lite/archive/refs/tags/v1.9.6.tar.gz" + sha256 = "cd0cb2c9c2c4a8f93972b3f5913ff00cd3733c732195df293c8f56f3ce0a018f" autoupdate.strategy = "latest_github_tag" [resources.ports] From ff5e388eab6103b5e894d2febdb3a2434352b18d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 24 Dec 2023 19:41:40 +0000 Subject: [PATCH 14/15] 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 3c3db7c..584e58b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented. If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Shipped version:** 1.9.5~ynh1 +**Shipped version:** 1.9.6~ynh1 **Demo:** https://video.etherpad.com/ diff --git a/README_fr.md b/README_fr.md index a87e2c6..2bcacd8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Version incluse :** 1.9.5~ynh1 +**Version incluse :** 1.9.6~ynh1 **Démo :** https://video.etherpad.com/ From 31267b5cae0785089ecfad4fc20aba085ce6b517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 24 Dec 2023 20:44:01 +0100 Subject: [PATCH 15/15] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4d67b12..ada6dca 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,7 +57,7 @@ fi if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json" fi @@ -110,7 +110,7 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # INSTALL ETHERPAD #================================================= -ynh_script_progression --message="Installing $app..." --weight=90 +ynh_script_progression --message="Installing $app..." --weight=60 pushd $install_dir ynh_use_nodejs