From c65f6dbae74e84b64f5888903e5e417a87b3e07d Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Thu, 2 Apr 2020 18:22:00 +0300
Subject: [PATCH] [*] Config section changed
---
CMakeLists.txt | 4 ++--
dist/share/configs/cellframe-node.cfg.tpl | 15 ++++++++++-----
libdap-server-udp | 2 +-
sources/main.c | 6 +++---
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a21b53f00..81f691f00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,8 @@ SET(DESTDIR "/opt/${PROJECT_NAME}")
SET( CPACK_GENERATOR "DEB")
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 2)
-SET( CPACK_PACKAGE_VERSION_MINOR 11)
-SET( CPACK_PACKAGE_VERSION_PATCH 6)
+SET( CPACK_PACKAGE_VERSION_MINOR 12)
+SET( CPACK_PACKAGE_VERSION_PATCH 1)
SET( CPACK_SYSTEM_TYPE "debian")
SET( CPACK_SYSTEM_VERSION "10.0")
diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl
index 5831fc20d..f4cb679b0 100755
--- a/dist/share/configs/cellframe-node.cfg.tpl
+++ b/dist/share/configs/cellframe-node.cfg.tpl
@@ -19,8 +19,13 @@ listen_address={SERVER_ADDR}
listen_port_tcp={SERVER_PORT}
# Builtin DNS server
-[builtin_dns]
-enabled=true
+[dns_server]
+enabled=false
+bootstrap_balancer=true
+
+[srv_dns]
+enabled=false
+pricelist=[]
# Mempool
[mempool]
@@ -39,12 +44,12 @@ domain=mydomain
tx_cond_create=false
registration_open=true
# List of condition templates, created for authorized users. Format of condition:
-# <wallet name>:<Value per transaction>:<Minimum time(seconds) between transactions>:<network name>
+# <wallet name>:<Value per transaction>:<Minimum time(seconds) between transactions>:<network name>
# tx_cond_templates=[mywallet0:0.00001:3600:KELT:kelvin-testnet,mywallet1:0.000001:3600:cETH:kelvin-testnet,mywallet0:1:10:WOOD:private]
# VPN stream channel processing module
[srv_vpn]
-# Turn to true if you want to share VPN service from you node
+# Turn to true if you want to share VPN service from you node
enabled=false
# List of loca security access groups. Built in: expats,admins,services,nobody,everybody
network_address=10.11.12.0
@@ -62,7 +67,7 @@ listen_unix_socket_path=/opt/cellframe-node/var/run/node_cli
# Application Resources
[resources]
# 0 means auto detect
-threads_cnt=0
+threads_cnt=0
pid_path=/opt/cellframe-node/var/run/cellframe-node.pid
log_file=/opt/cellframe-node/var/log/cellframe-node.log
wallets_path=/opt/cellframe-node/var/lib/wallet
diff --git a/libdap-server-udp b/libdap-server-udp
index 8a030e58c..bc7d3ae40 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 8a030e58cc5e9f88ce6c11824f887e98a72a755b
+Subproject commit bc7d3ae40ba757d89f0c6c8510cf725dc1661913
diff --git a/sources/main.c b/sources/main.c
index 23b9d2b93..213127a3d 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -421,9 +421,9 @@ int main( int argc, const char **argv )
// DNS server start
- bool bBuiltinDNSEnabled = dap_config_get_item_bool_default(g_config, "builtin_dns", "enabled", false);
- log_it(L_DEBUG, "config server->builtin_dns_enabled = \"%u\" ", bBuiltinDNSEnabled);
- if (bBuiltinDNSEnabled) {
+ bool bootstrap_balancer_enabled = dap_config_get_item_bool_default(g_config, "dns_server", "bootstrap_balancer", false);
+ log_it(L_DEBUG, "config dns_server->bootstrap_balancer = \"%u\" ", bootstrap_balancer_enabled);
+ if (bootstrap_balancer_enabled) {
dap_dns_server_start();
}
--
GitLab