Conflicts resolving

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
 SET( CPACK_PACKAGE_NAME  "${PROJECT_NAME}")
 SET( CPACK_PACKAGE_VERSION_MAJOR 3)
 SET( CPACK_PACKAGE_VERSION_MINOR 4)
-SET( CPACK_PACKAGE_VERSION_PATCH 1)
+SET( CPACK_PACKAGE_VERSION_PATCH 3)
 
 # init CellFrame SDK
 add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")

cellframe-sdk @ 0591e7d8

-Subproject commit f8f1412b393d50a4068390211a58cf9a1999adb3
+Subproject commit 0591e7d8c9fae864e2743439b0595b0a7abcba67

dist/share/configs/cellframe-node.cfg.tpl

@@ -14,6 +14,8 @@ auto_online={AUTO_ONLINE}
 enabled={SERVER_ENABLED}
 listen_address={SERVER_ADDR}
 listen_port_tcp={SERVER_PORT}
+news_url_enabled=false
+bugreport_url_enabled=false
 
 # Builtin DNS server
 [dns_server]
@@ -29,7 +31,7 @@ pricelist=[]
 # Automaticaly true if master node
 #auto_proc=false
 
-# Central Dataase
+# Central Database
 [cdb]
 enabled=false
 servers_list_enabled=false
@@ -49,6 +51,7 @@ registration_open=true
 [srv_vpn]
 #   Turn to true if you want to share VPN service from you node
 enabled=false
+geoip_enabled=false
 #   List of loca security access groups. Built in: expats,admins,services,nobody,everybody
 network_address=10.11.12.0
 network_mask=255.255.255.0
@@ -69,6 +72,7 @@ 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
+geoip_db_path=share/geoip/GeoLite2-City.mmdb
 ca_folders=[/opt/cellframe-node/var/lib/ca,/opt/cellframe-node/share/ca]
 dap_global_db_path=/opt/cellframe-node/var/lib/global_db
 dap_global_db_driver=cdb

prod_build/general/essentials/node-stretch-latest/.htaccess

+DirectoryIndex index.php index.html index.htm

prod_build/general/essentials/node-stretch-latest/index.php

+<script>
+window.onload = function(){
+     document.location = '../cellframe-node-3.4-2-amd64-stretch.deb';}
+</script>

prod_build/general/essentials/weblink-latest/.htaccess

+DirectoryIndex index.php index.html index.htm

prod_build/general/essentials/weblink-latest/index.php

+<script>
+window.onload = function(){
+     document.location = '../cellframe-node-3.2-2-Debian-10-amd64-buster.deb';}
+</script>

prod_build/linux/debian/scripts/deploy.sh

@@ -19,19 +19,25 @@ PKGFILES=$(ls . | grep .deb)
 [[ $ONBUILDSERVER == 0 ]] && scp -i $CELLFRAME_REPO_KEY ../prod_build/linux/debian/scripts/publish_remote/reprepro.sh "$CELLFRAME_REPO_CREDS:~/tmp/"
 for pkgfile in $PKGFILES; do
 	pkgname=$(echo $pkgfile | sed 's/.deb$//')
+	pkgname_public=$(echo $pkgname | cut -d '-' -f1-4,7-) #cutting away Debian-9.12
+	pkgname_weblink="$(echo $pkgname | cut -d '-' -f2,8 )-latest" #leaving only necessary entries
 	mv $pkgfile $wd/$PACKAGE_PATH/$pkgname$MOD.deb || { echo "[ERR] Something went wrong in publishing the package. Now aborting."; exit -4; }
 	CODENAME=$(echo $pkgname | rev | cut -d '-' -f1 | rev)
+	cp -r ../prod_build/general/essentials/weblink-latest ../prod_build/general/essentials/$pkgname_weblink
+	sed -i "/document/s/cellframe.*deb/$pkgname_public$MOD.deb/" ../prod_build/general/essentials/$pkgname_weblink/index.php
 	if [[ $ONBUILDSERVER == 0 ]]; then
 	#REPREPRO and file_cellframe_services
 		scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_REPO_CREDS:~/tmp/apt/"
-		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" "chmod +x ~/tmp/reprepro.sh && ~/tmp/reprepro.sh main $CODENAME ~/tmp/apt/$pkgname$MOD.deb $CELLFRAME_REPO_PATH"
-		scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/"
-		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "ln -sf $CELLFRAME_FILESERVER_PATH/$pkgname$MOD.deb $CELLFRAME_FILESERVER_PATH/$pkgname$MOD-latest.deb"
+		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" "chmod +x ~/tmp/reprepro.sh && ~/tmp/reprepro.sh main $CODENAME ~/tmp/apt/$pkgname_public$MOD.deb $CELLFRAME_REPO_PATH"
+		scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$pkgname_public$MOD.deb"
+		scp -r -i $CELLFRAME_REPO_KEY ../prod_build/general/essentials/$pkgname_weblink "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/"
+#		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "ln -sf $CELLFRAME_FILESERVER_PATH/$pkgname$MOD.deb $CELLFRAME_FILESERVER_PATH/$pkgname$MOD-latest.deb"
 	fi
+	rm -r ../prod_build/general/essentials/$pkgname_weblink
 done
 [[ $ONBUILDSERVER == 0 ]] && ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" "rm -v ~/tmp/reprepro.sh"
 
-	export -n "UPDVER"
+#	export -n "UPDVER"
 cd ..
 exit 0
 #symlink name-actual to the latest version.

python-cellframe @ cfaa3c0a

-Subproject commit fbb50e65fec326cd6ea2b47ebebbe5aad8feba39
+Subproject commit cfaa3c0afa73ecd3a140673d5e9a2125f9f7ba6a

sources/main.c

@@ -81,6 +81,7 @@
 #include "dap_chain_net_srv_datum.h"
 #include "dap_chain_net_bugreport.h"
 #include "dap_chain_net_news.h"
+#include "dap_chain_net_srv_geoip.h"
 
 #ifdef DAP_OS_LINUX
 #include "dap_chain_net_srv_vpn.h"
@@ -330,10 +331,16 @@ int main( int argc, const char **argv )
     // vpn client
     if(dap_chain_net_vpn_client_init(g_config) != 0) {
         log_it(L_ERROR, "Can't init dap chain network service vpn client");
-        return -71;
+        return -72;
     }
 #endif
 
+    if(dap_config_get_item_bool_default(g_config, "srv_vpn", "geoip_enabled", false)) {
+        if(chain_net_geoip_init(g_config) != 0) {
+            log_it(L_CRITICAL, "Can't init geoip module");
+            return -73;
+        }
+    }
 
 	if ( enc_http_init() != 0 ) {
 	    log_it( L_CRITICAL, "Can't init encryption http session storage module" );
@@ -415,7 +422,7 @@ int main( int argc, const char **argv )
             }
 
             // News URLs
-            bool l_news_url_enabled = dap_config_get_item_bool_default(g_config, "server", "l_news_url_enabled", false);
+            bool l_news_url_enabled = dap_config_get_item_bool_default(g_config, "server", "news_url_enabled", false);
             if(l_news_url_enabled) {
                 dap_chain_net_news_add_proc(DAP_HTTP(l_server));
             }