From 669f9c2d68f3bb15198a73556cc6399db6d4c26c Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 26 Jun 2021 22:09:34 +0200 Subject: [PATCH 1/3] Enable multi_instance --- check_process | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index be22d5a..ed977e7 100644 --- a/check_process +++ b/check_process @@ -40,7 +40,7 @@ # 1.15.1~ynh2 upgrade=1 from_commit=2a0a768ba1e8c93c2cd1b3ef97ac558c86ddc72c backup_restore=1 - multi_instance=0 + multi_instance=1 port_already_use=0 change_url=1 ;;; Options diff --git a/manifest.json b/manifest.json index bf55a24..ef00d19 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "requirements": { "yunohost": ">= 4.1.3" }, - "multi_instance": false, + "multi_instance": true, "services": [ "nginx" ], From 4fede257081acf51933b3dd7a2eda0fc7997638a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 30 Jun 2021 21:44:30 +0200 Subject: [PATCH 2/3] Specific $sync_port for listenaddress Specifying two listendaddress protocols: tcp and quic --- conf/config.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/config.xml b/conf/config.xml index 90f3aea..f2c384a 100644 --- a/conf/config.xml +++ b/conf/config.xml @@ -10,7 +10,8 @@ false - default + tcp://0.0.0.0:__SYNC_PORT__ + quic://0.0.0.0:__SYNC_PORT__ default true true From 4ba281b306d8d0a24a0cc0b0c061507e102a7c25 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 30 Jun 2021 22:03:58 +0200 Subject: [PATCH 3/3] Fix listening service weirdly broken config upon first start Seems to only affect the second or the quic:// protocol --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7a559d6..f26b3ae 100644 --- a/scripts/install +++ b/scripts/install @@ -143,7 +143,7 @@ chown -R $app: $final_path ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Access the GUI via the following URL" -ynh_replace_string --match_string="tcp://default" --replace_string="default" --target_file="$config_file" +ynh_replace_string --match_string="tcp://quic:%2F%2F0.0.0.0:$sync_port" --replace_string="quic//0.0.0.0:$sync_port" --target_file="$config_file" ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd