From 4a47555987cfdbbd4827b11474753484479df01b Mon Sep 17 00:00:00 2001
From: gabrik <gabriele.baldoni@gmail.com>
Date: Fri, 6 Jan 2023 15:25:19 +0100
Subject: [PATCH] adding zenohd configuration for zenoh-flow-plugin, update
 ports

Signed-off-by: gabrik <gabriele.baldoni@gmail.com>
---
 zenoh-flow-daemon/etc/zenoh-zf-router.json |  2 +-
 zenoh-flow-plugin/Cargo.toml               |  1 +
 zenoh-flow-plugin/etc/zenoh-zf-plugin.json | 39 ++++++++++++++++++++++
 zfctl/.config/zfctl-zenoh.json             |  2 +-
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 zenoh-flow-plugin/etc/zenoh-zf-plugin.json

diff --git a/zenoh-flow-daemon/etc/zenoh-zf-router.json b/zenoh-flow-daemon/etc/zenoh-zf-router.json
index 99990181..605062d5 100644
--- a/zenoh-flow-daemon/etc/zenoh-zf-router.json
+++ b/zenoh-flow-daemon/etc/zenoh-zf-router.json
@@ -14,7 +14,7 @@
 
 {
     "listen":{
-        "endpoints":["tcp/0.0.0.0:7887"]
+        "endpoints":["tcp/0.0.0.0:7447"]
     },
     "plugins_search_dirs":["/usr/lib/"],
     "plugins":{
diff --git a/zenoh-flow-plugin/Cargo.toml b/zenoh-flow-plugin/Cargo.toml
index 280c309e..dd846853 100644
--- a/zenoh-flow-plugin/Cargo.toml
+++ b/zenoh-flow-plugin/Cargo.toml
@@ -68,5 +68,6 @@ assets = [
     ["target/release/libzplugin_zenoh_flow.so", "/usr/lib/libzplugin_zenoh_flow.so", "644"],
     # assets
     ["../zenoh-flow-daemon/etc/extensions.d/placeholder", "/etc/zenoh-flow/extensions.d/placeholder", "644"],
+    ["etc/zenoh-zf-plugin.json", "/etc/zenoh-flow/zenoh-zf-plugin.json", "644"],
     ["../zenoh-flow-daemon/var/*", "/var/zenoh-flow", "644"],
 ]
\ No newline at end of file
diff --git a/zenoh-flow-plugin/etc/zenoh-zf-plugin.json b/zenoh-flow-plugin/etc/zenoh-zf-plugin.json
new file mode 100644
index 00000000..ce758e01
--- /dev/null
+++ b/zenoh-flow-plugin/etc/zenoh-zf-plugin.json
@@ -0,0 +1,39 @@
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+//
+// Contributors:
+//   ZettaScale Zenoh Team, <zenoh@zettascale.tech>
+//
+
+
+{
+    "listen":{
+        "endpoints":["tcp/0.0.0.0:7447"]
+    },
+    "plugins_search_dirs":["/usr/lib/"],
+    "plugins":{
+        "storage_manager":{
+        "required":true,
+        "storages":{
+            "zfrpc":{
+                "key_expr":"zf/runtime/**",
+                "volume": "memory"
+                },
+            "zf":{
+                "key_expr":"zenoh-flow/**",
+                "volume": "memory"
+                }
+            }
+        },
+        "zenoh_flow":{
+            "required":true,
+            "path":"/etc/zenoh-flow",
+            "pid_file": "/var/zenoh-flow/runtime.pid",
+            "extensions": "/etc/zenoh-flow/extensions.d",
+            "worker_pool_size":4
+        }
+    }
+}
\ No newline at end of file
diff --git a/zfctl/.config/zfctl-zenoh.json b/zfctl/.config/zfctl-zenoh.json
index d9732e35..313654c7 100644
--- a/zfctl/.config/zfctl-zenoh.json
+++ b/zfctl/.config/zfctl-zenoh.json
@@ -15,7 +15,7 @@
 {
     "connect":{
         // Connects to the local runtime
-        "endpoints":["tcp/127.0.0.1:7887"]
+        "endpoints":["tcp/127.0.0.1:7447"]
     },
     "mode":"client",
 }