From 8bf4fec97bd619eda7dadc879e7b21fb0e8ff7b9 Mon Sep 17 00:00:00 2001
From: dmitry <dmitry.puzyrkov@demlabs.net>
Date: Mon, 11 Dec 2023 17:18:45 +0700
Subject: [PATCH] [+]  config dbpath fix + service "after" fix

---
 dist.linux/share/cellframe-diagtool.service   | 3 ++-
 dist.linux/share/cellframe-node.asan.service  | 3 ++-
 dist.linux/share/cellframe-node.service       | 3 ++-
 dist.linux/share/cellframe-node.tsan.service  | 3 ++-
 dist.linux/share/cellframe-node.ubsan.service | 3 ++-
 dist.linux/share/cellframe-updater.service    | 5 +++--
 dist/share/configs/cellframe-node.cfg.tpl     | 2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dist.linux/share/cellframe-diagtool.service b/dist.linux/share/cellframe-diagtool.service
index f88e370fc..fb209b0eb 100644
--- a/dist.linux/share/cellframe-diagtool.service
+++ b/dist.linux/share/cellframe-diagtool.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe DiagTool
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node/
diff --git a/dist.linux/share/cellframe-node.asan.service b/dist.linux/share/cellframe-node.asan.service
index fb101ddd5..2e5c90cbc 100644
--- a/dist.linux/share/cellframe-node.asan.service
+++ b/dist.linux/share/cellframe-node.asan.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-node.service b/dist.linux/share/cellframe-node.service
index 269645dbe..0a3d8c177 100644
--- a/dist.linux/share/cellframe-node.service
+++ b/dist.linux/share/cellframe-node.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-node.tsan.service b/dist.linux/share/cellframe-node.tsan.service
index 904a41dad..09c2a89c1 100644
--- a/dist.linux/share/cellframe-node.tsan.service
+++ b/dist.linux/share/cellframe-node.tsan.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-node.ubsan.service b/dist.linux/share/cellframe-node.ubsan.service
index 798bd9d2b..885418a9d 100644
--- a/dist.linux/share/cellframe-node.ubsan.service
+++ b/dist.linux/share/cellframe-node.ubsan.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node
diff --git a/dist.linux/share/cellframe-updater.service b/dist.linux/share/cellframe-updater.service
index a1f119ebe..e01df7b55 100644
--- a/dist.linux/share/cellframe-updater.service
+++ b/dist.linux/share/cellframe-updater.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Cellframe Updater
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 WorkingDirectory=/opt/cellframe-node/
@@ -11,4 +12,4 @@ Group=root
 LogNamespace=cellframe
 
 [Install]
-WantedBy=timers.target
\ No newline at end of file
+WantedBy=timers.target
diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl
index fd624cb15..40f052b1e 100644
--- a/dist/share/configs/cellframe-node.cfg.tpl
+++ b/dist/share/configs/cellframe-node.cfg.tpl
@@ -137,8 +137,8 @@ wallets_path={PREFIX}/var/lib/wallet
 ca_folders=[{PREFIX}/var/lib/ca,{PREFIX}/share/ca]
 
 [global_db]
+path={PREFIX}/var/lib/global_db
 #driver={DB_DRIVER}
-#path={PREFIX}/var/lib/global_db
 #debug_more=true
 
 # Plugins
-- 
GitLab