nixy: iproute -> iproute2

This commit is contained in:
Asmir A 2024-11-05 17:19:40 +01:00
parent ecf5065588
commit 0a95372a68
Signed by: asmir
GPG Key ID: 020C42B7A9ABA3E2

View File

@ -238,8 +238,8 @@
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
ExecStart = "${pkgs.iproute}/bin/ip netns add %I"; ExecStart = "${pkgs.iproute2}/bin/ip netns add %I";
ExecStop = "${pkgs.iproute}/bin/ip netns del %I"; ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
}; };
}; };
@ -256,23 +256,23 @@
ExecStart = pkgs.writers.writeBash "wg-up" '' ExecStart = pkgs.writers.writeBash "wg-up" ''
set -e set -e
ENDPOINT_IP=$(${pkgs.coreutils-full}/bin/cat "${config.sops.secrets."wg_endpoint_proton".path}") ENDPOINT_IP=$(${pkgs.coreutils-full}/bin/cat "${config.sops.secrets."wg_endpoint_proton".path}")
${pkgs.iproute}/bin/ip link add proton_wg type wireguard ${pkgs.iproute2}/bin/ip link add proton_wg type wireguard
${pkgs.iproute}/bin/ip link set proton_wg netns wg ${pkgs.iproute2}/bin/ip link set proton_wg netns wg
${pkgs.iproute}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg ${pkgs.iproute2}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
${pkgs.iproute}/bin/ip netns exec wg \ ${pkgs.iproute2}/bin/ip netns exec wg \
${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}" ${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}"
${pkgs.iproute}/bin/ip netns exec wg \ ${pkgs.iproute2}/bin/ip netns exec wg \
${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \ ${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
endpoint "$ENDPOINT_IP:51820" \ endpoint "$ENDPOINT_IP:51820" \
persistent-keepalive "25" \ persistent-keepalive "25" \
allowed-ips "0.0.0.0/0" allowed-ips "0.0.0.0/0"
${pkgs.iproute}/bin/ip -n wg link set lo up ${pkgs.iproute2}/bin/ip -n wg link set lo up
${pkgs.iproute}/bin/ip -n wg link set proton_wg up ${pkgs.iproute2}/bin/ip -n wg link set proton_wg up
${pkgs.iproute}/bin/ip -n wg route add default dev proton_wg ${pkgs.iproute2}/bin/ip -n wg route add default dev proton_wg
''; '';
ExecStop = pkgs.writers.writeBash "wg-down" '' ExecStop = pkgs.writers.writeBash "wg-down" ''
${pkgs.iproute}/bin/ip -n wg route del default dev proton_wg ${pkgs.iproute2}/bin/ip -n wg route del default dev proton_wg
${pkgs.iproute}/bin/ip -n wg link del proton_wg ${pkgs.iproute2}/bin/ip -n wg link del proton_wg
''; '';
}; };
}; };