Updating vpn submodule

This commit is contained in:
rasmus-kirk
2024-03-05 01:21:44 +01:00
parent 190a33f8f3
commit cf3362a67b
10 changed files with 25 additions and 25 deletions
Generated
+15 -15
View File
@@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1705332421,
"narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=",
"lastModified": 1708939976,
"narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=",
"owner": "numtide",
"repo": "devshell",
"rev": "83cb93d6d063ad290beee669f4badf9914cc16ec",
"rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3",
"type": "github"
},
"original": {
@@ -28,11 +28,11 @@
]
},
"locked": {
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
@@ -76,11 +76,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1708501555,
"narHash": "sha256-zJaF0RkdIPbh8LTmnpW/E7tZYpqIE+MePzlWwUNob4c=",
"lastModified": 1709386671,
"narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b50a77c03d640716296021ad58950b1bb0345799",
"rev": "fa9a51752f1b5de583ad5213eb621be071806663",
"type": "github"
},
"original": {
@@ -122,11 +122,11 @@
]
},
"locked": {
"lastModified": 1708335038,
"narHash": "sha256-ETLZNFBVCabo7lJrpjD6cAbnE11eDOjaQnznmg/6hAE=",
"lastModified": 1709546977,
"narHash": "sha256-R0bi8zAWt1s1q7lSvwiFI8+kEL29rm4WtYTqPgjlEBs=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e504621290a1fd896631ddbc5e9c16f4366c9f65",
"rev": "e7a277c5d12bf570efa2427d9cfdb760b9a0512f",
"type": "github"
},
"original": {
@@ -142,11 +142,11 @@
]
},
"locked": {
"lastModified": 1709159289,
"narHash": "sha256-66eFi/SgygAMOLLLkH5oqwBiI4iE5Bj/kBJmmMhX8fg=",
"lastModified": 1709597689,
"narHash": "sha256-6pSgM6s2Rm2zAA/dYKAOK7wLNkzox5hBKOC5E5TJoO8=",
"owner": "Maroka-chan",
"repo": "VPN-Confinement",
"rev": "93804a1050d3699418f0f9472e9c5eca1aa8153d",
"rev": "2f5fffe81305e731593b1923acdf1c7653f1b17c",
"type": "github"
},
"original": {
+1 -1
View File
@@ -244,7 +244,7 @@ in with lib; {
# Port mappings
# TODO: openports if expose.vpn
vpnnamespaces.wg = mkIf cfg.vpn.enable {
portMappings = [{ From = defaultPort; To = defaultPort; }];
portMappings = [{ from = defaultPort; to = defaultPort; }];
};
};
}
+1 -1
View File
@@ -61,7 +61,7 @@ in {
# Port mappings
# TODO: openports
vpnnamespaces.wg = mkIf cfg.vpn.enable {
portMappings = [{ From = defaultPort; To = defaultPort; }];
portMappings = [{ from = defaultPort; to = defaultPort; }];
};
services.nginx = mkIf cfg.vpn.enable {
+1 -1
View File
@@ -226,7 +226,7 @@ in {
./dnsleaktest.sh
'' + (if cfg.vpn.vpnTestService.port != null then ''
echo "starting netcat on port ${builtins.toString cfg.vpn.vpnTestService.port}:"
nc -vnlpu ${builtins.toString cfg.vpn.vpnTestService.port}
nc -vnlp ${builtins.toString cfg.vpn.vpnTestService.port}
'' else "");
};
in "${vpn-test}/bin/vpn-test";
+1 -1
View File
@@ -85,7 +85,7 @@ in {
# Port mappings
# TODO: openports
vpnnamespaces.wg = {
portMappings = [{ From = defaultPort; To = defaultPort; }];
portMappings = [{ from = defaultPort; to = defaultPort; }];
};
};
}
+1 -1
View File
@@ -64,7 +64,7 @@ in {
# Port mappings
vpnnamespaces.wg = mkIf cfg.vpn.enable {
portMappings = [{ From = defaultPort; To = defaultPort; }];
portMappings = [{ from = defaultPort; to = defaultPort; }];
};
services.nginx = mkIf cfg.vpn.enable {
+1 -1
View File
@@ -62,7 +62,7 @@ in {
# Port mappings
vpnnamespaces.wg = mkIf cfg.vpn.enable {
portMappings = [{ From = defaultPort; To = defaultPort; }];
portMappings = [{ from = defaultPort; to = defaultPort; }];
};
services.nginx = mkIf cfg.vpn.enable {
+1 -1
View File
@@ -60,7 +60,7 @@ in {
# Port mappings
vpnnamespaces.wg = mkIf cfg.vpn.enable {
portMappings = [{ From = defaultPort; To = defaultPort; }];
portMappings = [{ from = defaultPort; to = defaultPort; }];
};
services.nginx = mkIf cfg.vpn.enable {
+1 -1
View File
@@ -66,7 +66,7 @@ in {
# Port mappings
vpnnamespaces.wg = mkIf cfg.vpn.enable {
portMappings = [{ From = defaultPort; To = defaultPort; }];
portMappings = [{ from = defaultPort; to = defaultPort; }];
};
services.nginx = mkIf cfg.vpn.enable {
+2 -2
View File
@@ -337,8 +337,8 @@ in {
# Port mappings
# TODO: open peerPort
vpnnamespaces.wg = mkIf cfg.vpn.enable {
portMappings = [{ From = cfg.uiPort; To = cfg.uiPort; }];
#openUdpPorts = [cfg.peerPort];
portMappings = [{ from = cfg.uiPort; to = cfg.uiPort; }];
openVPNPorts = [{ port = 24745; protocol = "both"; }];
#openTcpPorts = [cfg.peerPort];
};