[*] Conflicts resolved

.gitlab-ci.yml

 variables:
     GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_UPDATE_FLAGS: --force
 
 stages:
     - build

dist/share/configs/network/Backbone.cfg.tpl

@@ -5,6 +5,7 @@
 id=0x0404202200000000
 name=Backbone
 gdb_groups_prefix=scorpion
+links_static_only=true
 
 # Possible values: light, full, archive, master, root
 node-role={NODE_TYPE}

dist/share/configs/network/kelvpn-minkowski.cfg.tpl

@@ -6,6 +6,7 @@ id=0x000000000000aaaa
 name=kelvpn-minkowski
 # Possible values: light, full, archive, master, root
 node-role={NODE_TYPE}
+links_static_only=true
 
 seed_nodes_aliases=[minkowski.kelvpn.root.0,minkowski.kelvpn.root.1,minkowski.kelvpn.root.2]
 seed_nodes_hostnames=[0.root.minkowski.kelvpn.com,1.root.minkowski.kelvpn.com,2.root.minkowski.kelvpn.com]

dist/share/configs/network/mileena.cfg.tpl

@@ -5,6 +5,7 @@
 gdb_sync_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000::0002]
 id=0x000000000000cccc
 name=mileena
+links_static_only=true
 gdb_groups_prefix=mileena
 # Possible values: light, full, archive, master, root
 node-role={NODE_TYPE}

dist/share/configs/network/private.cfg.tpl

@@ -2,6 +2,7 @@
 # General section
 [general]
 id=0xFF00000000000001
+links_static_only=true
 auth_cert=
 name=private
 # Possible values: light, full, archive, master, root

dist/share/configs/network/subzero.cfg.tpl

@@ -4,6 +4,7 @@
 [general]
 id=0x000000000000acca
 name=subzero
+links_static_only=true
 # Possible values: light, full, archive, master, root
 node-role={NODE_TYPE}
 

os/debian/config

@@ -53,6 +53,15 @@ reconfigure|configure)
       db_go || true
    fi
 
+   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_input critical cellframe-node/enable_python_plugins || true 
    db_go || true 
 

scripts.darwin/create_configs.sh

 #!/bin/bash
 # Global settings
-export DAP_PREFIX=/Users/`whoami`/Applications/Cellframe.app/Contents/Resources
-export DAP_PREFIX_TPL="\\/Users\\/`whoami`\\/Applications\\/Cellframe.app\\/Contents\\/Resources"
+export DAP_PREFIX=/Users/$USER/Applications/Cellframe.app/Contents/Resources
+export DAP_PREFIX_TPL="\\/Users\\/$USER\\/Applications\\/Cellframe.app\\/Contents\\/Resources"
 export DAP_APP_NAME=cellframe-node
 export DAP_CHAINS_NAME=core-t
 export DAP_CFG_TPL=/Applications/Cellframe.app/Contents/Resources/share/configs/$DAP_APP_NAME.cfg.tpl
@@ -13,14 +13,6 @@ export DAP_SERVER_ENABLED=false
 export DAP_SERVER_ADDRESS=0.0.0.0
 export DAP_SERVER_PORT=8089
 
-# DapCash testnet
-export DAP_CORE_T_ENABLED=true
-export DAP_CORE_T_ROLE=full
-
-# Kelvin testnet
-export DAP_KELVIN_TESTNET_ENABLED=true
-export DAP_KELVIN_TESTNET_ROLE=full
-
 # Subzero testnet
 export DAP_SUBZERO_ENABLED=true
 export DAP_SUBZERO_ROLE=full
@@ -34,4 +26,4 @@ export DAP_MILEENA_ENABLED=true
 export DAP_MILEENA_ROLE=full
 
 echo "Init configs with prefix " $DAP_PREFIX
-../scripts/create_configs_from_tpl.sh
+./create_configs_from_tpl.sh

version.mk

 VERSION_MAJOR=5
 VERSION_MINOR=2
-VERSION_PATCH=0
+VERSION_PATCH=1
\ No newline at end of file