From f9afcc4447fc2ec97355622645023a56551e3d4b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 20 Jul 2022 07:35:52 +0200 Subject: [PATCH 1/4] Set full unicode support --- scripts/upgrade | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index e2a14e0..a4c5d35 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -309,6 +309,10 @@ chown $app:$app "$final_path/settings.json" chmod 600 "$final_path/credentials.json" chown $app:$app "$final_path/credentials.json" +# Support full Unicode in MySQL databases +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ + <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" + #================================================= # SETUP SYSTEMD #================================================= From 0ea4f01b1fb18aa35be4722bbee0d9979cbe5087 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 20 Jul 2022 07:42:07 +0200 Subject: [PATCH 2/4] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index a4c5d35..52a2f53 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -173,6 +173,10 @@ else ynh_permission_url --permission="admin" --auth_header=false fi +# Support full Unicode in MySQL databases +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ + <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" + #================================================= # CREATE DEDICATED USER #================================================= @@ -309,10 +313,6 @@ chown $app:$app "$final_path/settings.json" chmod 600 "$final_path/credentials.json" chown $app:$app "$final_path/credentials.json" -# Support full Unicode in MySQL databases -ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ - <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" - #================================================= # SETUP SYSTEMD #================================================= From 8c50ff331c8884fda65536c6b31a17a18956d705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Jul 2022 12:31:51 +0200 Subject: [PATCH 3/4] Bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 00c6dfb..f6e8903 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.18~ynh1", + "version": "1.8.18~ynh2", "url": "http://etherpad.org", "upstream": { "license": "Apache-2.0", From 2d77a62584f7797674b5db3569324e90d6bb0236 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Jul 2022 10:32:06 +0000 Subject: [PATCH 4/4] 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 0d412ac..f99ec8e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Etherpad is a real-time collaborative editor scalable to thousands of simultaneo - Scale - Etherpad running at scale with pad sharding which allows Etherpad to scale to ∞ number of Active Pads with up to 20,000 edits per second, per pad. -**Shipped version:** 1.8.18~ynh1 +**Shipped version:** 1.8.18~ynh2 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 82df587..5ac1b51 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle. -**Version incluse :** 1.8.18~ynh1 +**Version incluse :** 1.8.18~ynh2 **Démo :** https://video.etherpad.com