diff --git a/dist/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl index e5c99b68750c272a08e9e02c3e8db71f7ffca4b1..d593ef08e89b135ab1a162b02cb4afbfb65fe598 100644 --- a/dist/share/configs/cellframe-node.cfg.tpl +++ b/dist/share/configs/cellframe-node.cfg.tpl @@ -38,17 +38,17 @@ tx_cond_create=false # 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 -[vpn] +[srv_vpn] # Turn to true if you want to share VPN service from you node -enabled=false +enabled=true # List of loca security access groups. Built in: expats,admins,services,nobody,everybody -access_groups=expats,services,admins network_address=10.11.12.0 network_mask=255.255.255.0 # old VPN server [vpn_old] -enabled=true +enabled=false +access_groups=expats,services,admins network_address=10.11.11.0 network_mask=255.255.255.0 diff --git a/dist/share/configs/service/vpn.cfg b/dist/share/configs/service/vpn.cfg new file mode 100644 index 0000000000000000000000000000000000000000..0256d96397cfadfdf00b67ebf2abf1bc8bf4c585 --- /dev/null +++ b/dist/share/configs/service/vpn.cfg @@ -0,0 +1,4 @@ +[general] +enabled=true +uid=0x0000000000000001 +pricelist=[kelvin-testnet:0.00001:KELT:3600:SEC:mywallet0,kelvin-testnet:0.00001:cETH:3600:SEC:mywallet1,private:1:WOOD:10:SEC:mywallet0] diff --git a/libdap b/libdap index 9053a0597613f8dc685bfd756b058494b8aaef14..dd5def6c3f1321683014a06a66936fb92b94ea38 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit 9053a0597613f8dc685bfd756b058494b8aaef14 +Subproject commit dd5def6c3f1321683014a06a66936fb92b94ea38 diff --git a/libdap-chain b/libdap-chain index 65f715269361e3d9ba317537e655961f31bf2247..05aba3a3fe2c3eec25aa69b7bc581c2484369f03 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 65f715269361e3d9ba317537e655961f31bf2247 +Subproject commit 05aba3a3fe2c3eec25aa69b7bc581c2484369f03 diff --git a/libdap-chain-crypto b/libdap-chain-crypto index f8dfd888432234c0314057f5551a578dd770003c..73d80a90c7adb46f7322595ce899c718b78eea71 160000 --- a/libdap-chain-crypto +++ b/libdap-chain-crypto @@ -1 +1 @@ -Subproject commit f8dfd888432234c0314057f5551a578dd770003c +Subproject commit 73d80a90c7adb46f7322595ce899c718b78eea71 diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index 4d83c5afc1e0f71c24b48603557372f8bb20f021..1319d136f54fa65962a73881680df6216ce78086 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit 4d83c5afc1e0f71c24b48603557372f8bb20f021 +Subproject commit 1319d136f54fa65962a73881680df6216ce78086 diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa index 757f58797844421ce4b3b369e11dff9065acbfb6..810db1b64905477cde62e981d6f160da501660c7 160000 --- a/libdap-chain-cs-dag-poa +++ b/libdap-chain-cs-dag-poa @@ -1 +1 @@ -Subproject commit 757f58797844421ce4b3b369e11dff9065acbfb6 +Subproject commit 810db1b64905477cde62e981d6f160da501660c7 diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos index 52bf11864520d7090362713cadf87fe0d63bd8a3..54a41ae6f3eb85a5221d35a5376efa5cff02a5d3 160000 --- a/libdap-chain-cs-dag-pos +++ b/libdap-chain-cs-dag-pos @@ -1 +1 @@ -Subproject commit 52bf11864520d7090362713cadf87fe0d63bd8a3 +Subproject commit 54a41ae6f3eb85a5221d35a5376efa5cff02a5d3 diff --git a/libdap-chain-gdb b/libdap-chain-gdb index 86d32bd6dc2159e7fe3eb50996dd6b8c8f51be5d..76181225215f91f3a2a42671f735f70ade46d045 160000 --- a/libdap-chain-gdb +++ b/libdap-chain-gdb @@ -1 +1 @@ -Subproject commit 86d32bd6dc2159e7fe3eb50996dd6b8c8f51be5d +Subproject commit 76181225215f91f3a2a42671f735f70ade46d045 diff --git a/libdap-chain-global-db b/libdap-chain-global-db index b7d2fb60fe97c6f8e2a08cb41429d1f33a3bc353..8c6bbf4458bd10614bf48bb2da7e84b4f80f0d33 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit b7d2fb60fe97c6f8e2a08cb41429d1f33a3bc353 +Subproject commit 8c6bbf4458bd10614bf48bb2da7e84b4f80f0d33 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index 74421dd778babd15c0e8e2c28f9b4e4c1d93d41e..8399903a7d5b1861395023780688a024fcc6a27a 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit 74421dd778babd15c0e8e2c28f9b4e4c1d93d41e +Subproject commit 8399903a7d5b1861395023780688a024fcc6a27a diff --git a/libdap-chain-net b/libdap-chain-net index 8de30467285db82cdeef34e95eae60efecec95d3..491c088b2020242747f478ae7db183934c0777f5 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 8de30467285db82cdeef34e95eae60efecec95d3 +Subproject commit 491c088b2020242747f478ae7db183934c0777f5 diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index cafb5af4984e8ee347518c0718f5c68733b51f3a..620d2eff0406ff4202d5bfb7b79c2ce3752bad84 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit cafb5af4984e8ee347518c0718f5c68733b51f3a +Subproject commit 620d2eff0406ff4202d5bfb7b79c2ce3752bad84 diff --git a/libdap-chain-net-srv-app b/libdap-chain-net-srv-app index 18e4d357d6d984b96ea8c95582d206217ab3f032..dc6e3b30992d3988c7f9f3a159c8286e28bea9ae 160000 --- a/libdap-chain-net-srv-app +++ b/libdap-chain-net-srv-app @@ -1 +1 @@ -Subproject commit 18e4d357d6d984b96ea8c95582d206217ab3f032 +Subproject commit dc6e3b30992d3988c7f9f3a159c8286e28bea9ae diff --git a/libdap-chain-net-srv-app-db b/libdap-chain-net-srv-app-db index 9e115e17ab30a8b6df0507471e2c08a4dad8c184..995568917a9796dec412ad13124628fb8fff53ba 160000 --- a/libdap-chain-net-srv-app-db +++ b/libdap-chain-net-srv-app-db @@ -1 +1 @@ -Subproject commit 9e115e17ab30a8b6df0507471e2c08a4dad8c184 +Subproject commit 995568917a9796dec412ad13124628fb8fff53ba diff --git a/libdap-chain-net-srv-datum b/libdap-chain-net-srv-datum index 602391159d47da34b08d8da743812a26a2efdd97..a317a59e7eec49738288a476548906aab6ea43fe 160000 --- a/libdap-chain-net-srv-datum +++ b/libdap-chain-net-srv-datum @@ -1 +1 @@ -Subproject commit 602391159d47da34b08d8da743812a26a2efdd97 +Subproject commit a317a59e7eec49738288a476548906aab6ea43fe diff --git a/libdap-chain-net-srv-datum-pool b/libdap-chain-net-srv-datum-pool index 883e227be78ca7f2aa33a9283b5122198875dad3..640e49fdc8c2a78aa9ae0930adcf03e149df6607 160000 --- a/libdap-chain-net-srv-datum-pool +++ b/libdap-chain-net-srv-datum-pool @@ -1 +1 @@ -Subproject commit 883e227be78ca7f2aa33a9283b5122198875dad3 +Subproject commit 640e49fdc8c2a78aa9ae0930adcf03e149df6607 diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index 3c2d9d78765d06941ef3474070ad68267f51dff4..deeb68c6f984b248579880e4857e21cd7b8b3a84 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit 3c2d9d78765d06941ef3474070ad68267f51dff4 +Subproject commit deeb68c6f984b248579880e4857e21cd7b8b3a84 diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 3fcaedb1f33a3db1bde6050f824fdabf07e9ad34..1d23760cc25190ff114eac4cab212459360936f8 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 3fcaedb1f33a3db1bde6050f824fdabf07e9ad34 +Subproject commit 1d23760cc25190ff114eac4cab212459360936f8 diff --git a/libdap-client b/libdap-client index b583f811fe3221c51f491809095340e0a6ff47af..1ae33a38297c2c9aa77a691ff0b642d2650199d3 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit b583f811fe3221c51f491809095340e0a6ff47af +Subproject commit 1ae33a38297c2c9aa77a691ff0b642d2650199d3 diff --git a/libdap-server b/libdap-server index d7401c1493dbbd86e843c639182469c09331d077..b3018df9a34d3ccc4de162a857a0c74bef1640f7 160000 --- a/libdap-server +++ b/libdap-server @@ -1 +1 @@ -Subproject commit d7401c1493dbbd86e843c639182469c09331d077 +Subproject commit b3018df9a34d3ccc4de162a857a0c74bef1640f7 diff --git a/libdap-server-core b/libdap-server-core index 0f9f2923b4f650ea1a6af6cc1207a2f44a1cf7fe..975ad926195bb5965d8c5d54cb3f65d458bf62e0 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit 0f9f2923b4f650ea1a6af6cc1207a2f44a1cf7fe +Subproject commit 975ad926195bb5965d8c5d54cb3f65d458bf62e0 diff --git a/libdap-server-http-db b/libdap-server-http-db index f3f0b0ed919d37368e86210940ebb9de686879a1..8d974654dc02860dae64b313aadc1c062c5c4dc3 160000 --- a/libdap-server-http-db +++ b/libdap-server-http-db @@ -1 +1 @@ -Subproject commit f3f0b0ed919d37368e86210940ebb9de686879a1 +Subproject commit 8d974654dc02860dae64b313aadc1c062c5c4dc3 diff --git a/libdap-server-http-db-auth b/libdap-server-http-db-auth index 05f39736dba67c489454f3bb505d6baf900e27f2..d5e1eb429228ebe5d237155ee8ba6afae4db74e7 160000 --- a/libdap-server-http-db-auth +++ b/libdap-server-http-db-auth @@ -1 +1 @@ -Subproject commit 05f39736dba67c489454f3bb505d6baf900e27f2 +Subproject commit d5e1eb429228ebe5d237155ee8ba6afae4db74e7 diff --git a/libdap-server-udp b/libdap-server-udp index 8e0641bceb42e785dae16040ef3458a178e1b9f5..85eb1b45da29cb72d4df23eac50606bced02171a 160000 --- a/libdap-server-udp +++ b/libdap-server-udp @@ -1 +1 @@ -Subproject commit 8e0641bceb42e785dae16040ef3458a178e1b9f5 +Subproject commit 85eb1b45da29cb72d4df23eac50606bced02171a diff --git a/libdap-stream b/libdap-stream index af3ea52745feb78f9ca9f23125dd42dbbd144731..a2ae05dcafd2e37c1e371d422beee9f2949b8fa3 160000 --- a/libdap-stream +++ b/libdap-stream @@ -1 +1 @@ -Subproject commit af3ea52745feb78f9ca9f23125dd42dbbd144731 +Subproject commit a2ae05dcafd2e37c1e371d422beee9f2949b8fa3 diff --git a/libdap-stream-ch b/libdap-stream-ch index c90d1ec2c98a7062d5a3afdf71df873e829f72c4..84e0d96f6301339572b62c363b5d46feab354521 160000 --- a/libdap-stream-ch +++ b/libdap-stream-ch @@ -1 +1 @@ -Subproject commit c90d1ec2c98a7062d5a3afdf71df873e829f72c4 +Subproject commit 84e0d96f6301339572b62c363b5d46feab354521 diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index f5fe9e183e788af329d863645986d1c1cf17a65a..d05bf6589b3a83ea9d1f8a5aa4b590ea253a613e 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit f5fe9e183e788af329d863645986d1c1cf17a65a +Subproject commit d05bf6589b3a83ea9d1f8a5aa4b590ea253a613e diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net index cd646f0008051a5bc9a9c32f4ba6641f9ed4c444..c819e1c4c8b6d77d7093f6a6a43584e828250f72 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit cd646f0008051a5bc9a9c32f4ba6641f9ed4c444 +Subproject commit c819e1c4c8b6d77d7093f6a6a43584e828250f72 diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv index 9f7ed19b5956822f2587dba7f09886c48e139a8e..0c96cf2c10c9d2812a90d4bb7d45ba721c602e87 160000 --- a/libdap-stream-ch-chain-net-srv +++ b/libdap-stream-ch-chain-net-srv @@ -1 +1 @@ -Subproject commit 9f7ed19b5956822f2587dba7f09886c48e139a8e +Subproject commit 0c96cf2c10c9d2812a90d4bb7d45ba721c602e87 diff --git a/libdap-stream-ch-vpn b/libdap-stream-ch-vpn index 02652f21a7d7b741193610487d0de05dd2d51f57..fedae323e8c0c3547dda3c17a20252b51e4b2395 160000 --- a/libdap-stream-ch-vpn +++ b/libdap-stream-ch-vpn @@ -1 +1 @@ -Subproject commit 02652f21a7d7b741193610487d0de05dd2d51f57 +Subproject commit fedae323e8c0c3547dda3c17a20252b51e4b2395