From 75c6f83f049f15506196fcc331b2df16d369004e Mon Sep 17 00:00:00 2001
From: Dmitry Puzyrkov <dmitry.puzyrkov@demlabs.net>
Date: Mon, 11 Sep 2023 15:41:53 +0000
Subject: [PATCH] Hotfix meleena enable
---
dist/etc/network/mileena/main.cfg | 4 +--
.../{mileena.cfg.tpl.dis => mileena.cfg.tpl} | 10 +++----
os/debian/config | 14 +++++-----
os/debian/postinst | 28 ++++++++-----------
version.mk | 2 +-
5 files changed, 26 insertions(+), 32 deletions(-)
rename dist/share/configs/network/{mileena.cfg.tpl.dis => mileena.cfg.tpl} (88%)
diff --git a/dist/etc/network/mileena/main.cfg b/dist/etc/network/mileena/main.cfg
index a380b7ff9..aa4187d13 100755
--- a/dist/etc/network/mileena/main.cfg
+++ b/dist/etc/network/mileena/main.cfg
@@ -14,8 +14,8 @@ storage_dir=../../../var/lib/network/mileena/main/
[blocks]
is_celled=false
-is_static_genesis_event=true
-static_genesis_event=0x1DB1E136B583A1553E4829D6A0453338B7413DDB1B12189F8456B064E822667F
+is_static_genesis_block=true
+static_genesis_block=0x1DB1E136B583A1553E4829D6A0453338B7413DDB1B12189F8456B064E822667F
[esbocs]
consensus_debug=true
diff --git a/dist/share/configs/network/mileena.cfg.tpl.dis b/dist/share/configs/network/mileena.cfg.tpl
similarity index 88%
rename from dist/share/configs/network/mileena.cfg.tpl.dis
rename to dist/share/configs/network/mileena.cfg.tpl
index 1adb2e0a4..5794f5094 100755
--- a/dist/share/configs/network/mileena.cfg.tpl.dis
+++ b/dist/share/configs/network/mileena.cfg.tpl
@@ -1,6 +1,5 @@
# mileena net config
-# General section
[general]
gdb_sync_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000::0002]
id=0x000000000000cccc
@@ -13,7 +12,7 @@ node-role={NODE_TYPE}
seed_nodes_aliases=[0.root.mileena,1.root.mileena,2.root.mileena]
seed_nodes_hostnames=[0.root.mileena.cellframe.net,1.root.mileena.cellframe.net,2.root.mileena.cellframe.net]
seed_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000::0002]
-seed_nodes_port=[8099,8099,8099]
+seed_nodes_port=[8199,8199,8199]
require_links=2
#[auth]
@@ -26,7 +25,8 @@ require_links=2
#[dag-poa]
#events-sign-cert=mileena.0.root
-#[esbocs]
+#[block-ton]
+#blocks-sign-cert=mileena.0.master
+
+#[block-poa]
#blocks-sign-cert=mycert
-#minimum_fee=1.0
-#fee_addr=myaddr
diff --git a/os/debian/config b/os/debian/config
index 7eaaad5e9..8bb9ddf6d 100755
--- a/os/debian/config
+++ b/os/debian/config
@@ -82,14 +82,14 @@ reconfigure|configure)
# fi
-# db_input critical cellframe-node/mileena_enabled || true
-# db_go || true
+ db_input critical cellframe-node/mileena_enabled || true
+ db_go || true
-# db_get cellframe-node/mileena_enabled
-# if [ "$RET" = "true" ]; then
-# db_input critical cellframe-node/mileena_node_type || true
-# db_go || true
-# fi
+ db_get cellframe-node/mileena_enabled
+ if [ "$RET" = "true" ]; then
+ db_input critical cellframe-node/mileena_node_type || true
+ db_go || true
+ fi
db_input critical cellframe-node/enable_python_plugins || true
db_go || true
diff --git a/os/debian/postinst b/os/debian/postinst
index 0a7d5f625..b6a874d84 100755
--- a/os/debian/postinst
+++ b/os/debian/postinst
@@ -141,29 +141,23 @@ NET_NAME="mileena"
db_get cellframe-node/mileena_enabled || true
if [ "$RET" = "true" ]; then
-
DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
+ DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
+ DAP_NET_CFG=""
if [ -e "$DAP_CFG_NET" ]; then
- mv "$DAP_CFG_NET" "$DAP_CFG_NET".dis
- echo "[*] Disabled meelena"
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
+ else
+ DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
fi
-
-# DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
-# DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl"
-# DAP_NET_CFG=""
-# if [ -e "$DAP_CFG_NET" ]; then
-# DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new"
-# else
-# DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg"
-# fi
-# cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
-# db_get cellframe-node/mileena_node_type || true
-# NODE_TYPE=$RET
-# sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true
-# echo "[*] Enabled mileena"
+ cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true
+ db_get cellframe-node/mileena_node_type || true
+ NODE_TYPE=$RET
+ sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true
+ echo "[*] Enabled mileena"
fi
+
# Init Minkowski
NET_NAME="kelvpn-minkowski"
diff --git a/version.mk b/version.mk
index 9d67b1446..16fdf4ad8 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
VERSION_MAJOR=5
VERSION_MINOR=2
-VERSION_PATCH=299
+VERSION_PATCH=300
--
GitLab