clan/clan-infra
10
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

test official zerotier-tcp-proxy

Browse Source
This commit is contained in:
Jörg Thalheim 2023-07-12 10:56:39 +02:00
parent 14a39f207d
commit ed9bb9b9e9
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/zerotier/default.nix
View File

@ -25,7 +25,9 @@
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
# imap port # imap port
ExecStart = "${pkgs.callPackage ../../pkgs/zt-tcp-relay.nix {}}/bin/zt-tcp-relay --listen [::]:993"; ExecStart = "${pkgs.callPackage ../../pkgs/zerotier-tcp-proxy.nix {
zerotierProxyPort = 993;
}}/bin/zerotier-tcp-proxy";
Restart = "always"; Restart = "always";
RestartSec = 5; RestartSec = 5;
DynamicUser = true; DynamicUser = true;

3
pkgs/zerotier-tcp-proxy.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, zerotierone }: { stdenv, fetchFromGitHub, fetchpatch, zerotierProxyPort ? 443 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zerotier-tcp-proxy"; name = "zerotier-tcp-proxy";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -15,6 +15,7 @@ stdenv.mkDerivation {
]; ];
buildPhase = '' buildPhase = ''
pushd tcp-proxy pushd tcp-proxy
sed -i -e "s/ZT_TCP_PROXY_TCP_PORT.*443/ZT_TCP_PROXY_TCP_PORT ${toString zerotierProxyPort}/g" tcp-proxy.cpp
cat tcp-proxy.cpp cat tcp-proxy.cpp
make -j $NIX_BUILD_CORES CXX=$CXX make -j $NIX_BUILD_CORES CXX=$CXX
popd popd

10
targets/web01/terraform.tfstate
View File

File diff suppressed because one or more lines are too long