Compare commits
1 Commits
626834c2a4
...
updated-in
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43e3355b30 |
6
flake.lock
generated
6
flake.lock
generated
@@ -666,11 +666,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1761114652,
|
"lastModified": 1762977756,
|
||||||
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
|
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
|
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -60,10 +60,4 @@
|
|||||||
ip46tables -t mangle -A forward-mangle -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
|
ip46tables -t mangle -A forward-mangle -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
|
||||||
'';
|
'';
|
||||||
|
|
||||||
networking.firewall.extraCommands = ''
|
|
||||||
# Reject all IPv4 traffic that tries to enter and leave the PPP tunnel
|
|
||||||
iptables -I INPUT -i ppp-ncfttb -j DROP
|
|
||||||
iptables -I OUTPUT -o ppp-ncfttb -j DROP
|
|
||||||
'';
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ if TUNNEL_INTERFACE_CONFIG="$(ip --json link show "${TUNNEL_INTERFACE_NAME}")";
|
|||||||
if [[ "${TUNNEL_INTERFACE_ORIGIN_ADDRESS}" != "${WAN_INTERFACE_ADDRESS}" || "${TUNNEL_INTERFACE_REMOTE_ADDRESS}" != "${AFTR_ADDRESS}" || "${TUNNEL_INTERFACE_OPERSTATE}" != "UNKNOWN" ]]; then
|
if [[ "${TUNNEL_INTERFACE_ORIGIN_ADDRESS}" != "${WAN_INTERFACE_ADDRESS}" || "${TUNNEL_INTERFACE_REMOTE_ADDRESS}" != "${AFTR_ADDRESS}" || "${TUNNEL_INTERFACE_OPERSTATE}" != "UNKNOWN" ]]; then
|
||||||
log_tunnel "Bad configuration, fixing tunnel parameter"
|
log_tunnel "Bad configuration, fixing tunnel parameter"
|
||||||
|
|
||||||
ip tunnel change "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}" encaplimit none
|
ip tunnel change "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}"
|
||||||
ip link set "$TUNNEL_INTERFACE_NAME" up
|
ip link set "$TUNNEL_INTERFACE_NAME" up
|
||||||
else
|
else
|
||||||
log_tunnel "Tunnel already configured"
|
log_tunnel "Tunnel already configured"
|
||||||
@@ -91,7 +91,7 @@ if TUNNEL_INTERFACE_CONFIG="$(ip --json link show "${TUNNEL_INTERFACE_NAME}")";
|
|||||||
else
|
else
|
||||||
log_tunnel "Setting up DS-Lite tunnel"
|
log_tunnel "Setting up DS-Lite tunnel"
|
||||||
|
|
||||||
ip tunnel add "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}" encaplimit none
|
ip tunnel add "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}"
|
||||||
ip link set "$TUNNEL_INTERFACE_NAME" up
|
ip link set "$TUNNEL_INTERFACE_NAME" up
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ with lib;
|
|||||||
|
|
||||||
boot.resumeDevice = lib.optionalString ((lib.length config.swapDevices) > 0) (lib.head config.swapDevices).device;
|
boot.resumeDevice = lib.optionalString ((lib.length config.swapDevices) > 0) (lib.head config.swapDevices).device;
|
||||||
services.logind = {
|
services.logind = {
|
||||||
settings.Login.HandleLidSwitch = "suspend-then-hibernate";
|
lidSwitch = "suspend-then-hibernate";
|
||||||
};
|
};
|
||||||
systemd.sleep.extraConfig = ''
|
systemd.sleep.extraConfig = ''
|
||||||
HibernateDelaySec=30m
|
HibernateDelaySec=30m
|
||||||
|
|||||||
@@ -11,10 +11,8 @@ with lib;
|
|||||||
config = mkIf config.profiles.clerie.router.enable {
|
config = mkIf config.profiles.clerie.router.enable {
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
conntrack-tools
|
|
||||||
iptstate # show conntrack table
|
|
||||||
tcpdump
|
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
|
tcpdump
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernel.sysctl = {
|
boot.kernel.sysctl = {
|
||||||
|
|||||||
Reference in New Issue
Block a user