From 723de58767549e4fda3e749d03c85cc27dfc62cd Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Wed, 1 Nov 2023 22:33:55 +0100 Subject: [PATCH 1/4] Trim trailing / from URL. --- doc/POST_INSTALL.md | 2 +- scripts/change_url | 2 +- scripts/install | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 3481a9f..5a65e17 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1 +1 @@ -Please open `about:config` in your Firefox and point `identity.sync.tokenserver.uri` to `__DOMAIN____PATH__`. \ No newline at end of file +Please open `about:config` in your Firefox and point `identity.sync.tokenserver.uri` to `https://__DOMAIN__/1.0/sync/1.5`. \ No newline at end of file diff --git a/scripts/change_url b/scripts/change_url index fcd0508..10dd6d2 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -31,7 +31,7 @@ ynh_change_url_nginx_config # Retarget worker nodes #================================================= -ynh_mysql_execute_as_root --sql="UPDATE nodes set node='https://$new_domain' WHERE node='https://$old_domain'" --database="$db_name_tokenserver"; +ynh_mysql_execute_as_root --sql="UPDATE nodes set node='https://${new_domain%%+(/)}' WHERE node='https://${old_domain%%+(/)}'" --database="$db_name_tokenserver"; #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index d8b6554..b1eac3b 100644 --- a/scripts/install +++ b/scripts/install @@ -81,7 +81,7 @@ ynh_exec_as $app python -m venv "${install_dir}/venv" ynh_mysql_execute_as_root --sql="INSERT INTO services (id, service, pattern) VALUES (1, 'sync-1.5', '{node}/1.5/{uid}')" --database="$db_name_tokenserver"; - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH SYNC_TOKENSERVER__DATABASE_URL="mysql://$db_user:${db_pwd}@localhost/$db_name_tokenserver" $install_dir/venv/bin/python tools/tokenserver/add_node.py "https://$domain$path_url" 10 + ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH SYNC_TOKENSERVER__DATABASE_URL="mysql://$db_user:${db_pwd}@localhost/$db_name_tokenserver" $install_dir/venv/bin/python tools/tokenserver/add_node.py "https://${domain%%+(/)}" 10 popd ) From 9b9990d20e5df53d98d9e6a84d30a7a009d217ec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 Nov 2023 21:34:04 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index ad9b099..0159b28 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Second-generation server for Firefox Sync written in Rust. * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 3daa684..d6b7af9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,6 +25,7 @@ Second-generation server for Firefox Sync written in Rust. * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 24b8990f186baaae8ad97a60f9a39d1ed6ed80ea Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Wed, 1 Nov 2023 23:20:50 +0100 Subject: [PATCH 3/4] Bump version. --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9c96197..667daf5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -8,7 +8,7 @@ name = "Firefox SyncStorage" description.en = "New Firefox Sync Storage implemented in Rust. Allows syncing tabs, passwords, history etc. between Firefox instances." description.fr = "New Firefox Sync Storage implemented in Rust." -version = "0.14.1" +version = "0.14.1~ynh2" maintainers = ["orhtej2"] From d42dc4c2dfe67a68ccf0b8de3a80baf670c32424 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 Nov 2023 22:21:34 +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 0159b28..71744f5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Second-generation server for Firefox Sync written in Rust. -**Shipped version:** 0.14.1 +**Shipped version:** 0.14.1~ynh2 ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index d6b7af9..a39afca 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Second-generation server for Firefox Sync written in Rust. -**Version incluse :** 0.14.1 +**Version incluse :** 0.14.1~ynh2 ## Documentations et ressources * Site officiel de l’app :