From 48b3fdfc20f5b5e5b8386256f0a0e7785ed242ac Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 15 Oct 2022 07:58:30 +0200 Subject: [PATCH] Fix upgrade from 0.6.1~ynh1 (#96) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 0.5.5 (#89) * Upgrade binaries * Auto-update README Co-authored-by: yunohost-bot * Auto-update README * Update upgrade * 0.6 (#91) * 0.6 * Auto-update README Co-authored-by: yunohost-bot * Implement LDAP authentication * Auto-update README * Update upgrade * Fix datadir * Update scripts/install Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> * Update scripts/install Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> * Update conf/groupname-ldap.json Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> * Fix upgrade from 0.6~ynh1 and before * Upgrade to 0.6.1 * typo * Update manifest.json * Auto-update README * Fix sources * Fix upgrade from 0.6.1~ynh1 * Auto-update README Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++++ manifest.json | 2 +- scripts/upgrade | 10 +++++----- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index cf3e564..8ffb05c 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Galène is a videoconference server (an “SFU”) that is easy to deploy and th - built-in TURN server. -**Shipped version:** 0.6.1~ynh2 +**Shipped version:** 0.6.1~ynh3 **Demo:** https://galene.org:8443/ diff --git a/README_fr.md b/README_fr.md index 0223ace..e23b1fd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ Galène est un serveur de visioconférence (un « SFU ») facile à déployer et - détection d'activité -**Version incluse :** 0.6.1~ynh2 +**Version incluse :** 0.6.1~ynh3 **Démo :** https://galene.org:8443/ diff --git a/check_process b/check_process index 1819cef..89ea880 100644 --- a/check_process +++ b/check_process @@ -18,6 +18,10 @@ upgrade=1 from_commit=aaae7fbe83ce001fabd40509882e765a5d8da2c1 # 0.6~ynh1 upgrade=1 from_commit=c5cc50f1b1f326080f4f657b7805f2c27c1c3f20 + # 0.6.1~ynh1 + upgrade=1 from_commit=f55a3d1990a0fb2fe17eb9b70aefb13337c2b623 + # 0.6.1~ynh2 + upgrade=1 from_commit=ed1506fa3eb56358fecb06d832c9684acbf682d9 backup_restore=1 multi_instance=0 port_already_use=0 diff --git a/manifest.json b/manifest.json index 1197b01..67bac02 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Videoconferencing server that is easy to deploy", "fr": "Serveur de visioconférence facile à déployer" }, - "version": "0.6.1~ynh2", + "version": "0.6.1~ynh3", "url": "https://galene.org/", "upstream": { "license": "MIT", diff --git a/scripts/upgrade b/scripts/upgrade index 2f1d9a5..1fbf38b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -132,13 +132,13 @@ then ynh_setup_source --dest_dir="$final_path/build" ynh_setup_source --dest_dir="$final_path/build_ldap" --source_id="ldap" + mkdir -p "$final_path/live/data" + mkdir -p "$final_path/live_ldap/data" + ynh_secure_remove --file="$final_path/live/static/" + cp -r "$final_path/build/static/" "$final_path/live/" + ynh_replace_string --match_string="
Galène
" --replace_string="
Galène
" --target_file="$final_path/live/static/galene.html" fi -mkdir -p "$final_path/live/data" -mkdir -p "$final_path/live_ldap/data" -ynh_secure_remove --file="$final_path/live/static/" -cp -r "$final_path/build/static/" "$final_path/live/" -ynh_replace_string --match_string="
Galène
" --replace_string="
Galène
" --target_file="$final_path/live/static/galene.html" chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path"