From 7f9af41bd119784d4f062731911d1485d224ec73 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 24 Apr 2024 00:53:09 -0400 Subject: [PATCH] fix vpn host naming --- .../filesystem/etc/systemd/system/openvpn-client-tr@.service | 0 .../filesystem/etc/systemd/system/openvpn-client-tr@.service | 0 .../filesystem/etc/systemd/system/openvpn-client-tr@.service | 0 .../filesystem/etc/systemd/system/openvpn-client-tr@.service | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename machine_specific/{bow => bo}/filesystem/etc/systemd/system/openvpn-client-tr@.service (100%) rename machine_specific/{sow => so}/filesystem/etc/systemd/system/openvpn-client-tr@.service (100%) rename machine_specific/{syw => sy}/filesystem/etc/systemd/system/openvpn-client-tr@.service (100%) rename machine_specific/{x2w => x2}/filesystem/etc/systemd/system/openvpn-client-tr@.service (94%) diff --git a/machine_specific/bow/filesystem/etc/systemd/system/openvpn-client-tr@.service b/machine_specific/bo/filesystem/etc/systemd/system/openvpn-client-tr@.service similarity index 100% rename from machine_specific/bow/filesystem/etc/systemd/system/openvpn-client-tr@.service rename to machine_specific/bo/filesystem/etc/systemd/system/openvpn-client-tr@.service diff --git a/machine_specific/sow/filesystem/etc/systemd/system/openvpn-client-tr@.service b/machine_specific/so/filesystem/etc/systemd/system/openvpn-client-tr@.service similarity index 100% rename from machine_specific/sow/filesystem/etc/systemd/system/openvpn-client-tr@.service rename to machine_specific/so/filesystem/etc/systemd/system/openvpn-client-tr@.service diff --git a/machine_specific/syw/filesystem/etc/systemd/system/openvpn-client-tr@.service b/machine_specific/sy/filesystem/etc/systemd/system/openvpn-client-tr@.service similarity index 100% rename from machine_specific/syw/filesystem/etc/systemd/system/openvpn-client-tr@.service rename to machine_specific/sy/filesystem/etc/systemd/system/openvpn-client-tr@.service diff --git a/machine_specific/x2w/filesystem/etc/systemd/system/openvpn-client-tr@.service b/machine_specific/x2/filesystem/etc/systemd/system/openvpn-client-tr@.service similarity index 94% rename from machine_specific/x2w/filesystem/etc/systemd/system/openvpn-client-tr@.service rename to machine_specific/x2/filesystem/etc/systemd/system/openvpn-client-tr@.service index 9d386a8..8a764b1 100644 --- a/machine_specific/x2w/filesystem/etc/systemd/system/openvpn-client-tr@.service +++ b/machine_specific/x2/filesystem/etc/systemd/system/openvpn-client-tr@.service @@ -24,10 +24,10 @@ LimitNPROC=10 # we use .1 to make this be on a different network than kd, so that we can # talk to transmission on kd from remote host, and still use this # vpn. -ExecStartPre=/usr/bin/flock -w 20 /tmp/newns.flock /a/bin/newns/newns -n 10.174.28 start %i +ExecStartPre=/usr/bin/flock -w 20 /tmp/newns.flock /a/bin/newns/newns -n 10.174.23 start %i ExecStartPre=/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/netns.rules # allow wireguard network to connect -ExecStartPre=/usr/sbin/ip r add 10.8.0.0/24 via 10.174.28.1 dev veth1-client +ExecStartPre=/usr/sbin/ip r add 10.8.0.0/24 via 10.174.23.1 dev veth1-client ExecStopPost=/usr/bin/flock -w 20 /tmp/newns.flock /a/bin/newns/newns stop %i PrivateNetwork=true BindReadOnlyPaths=/etc/tr-resolv:/run/systemd/resolve:norbind /etc/basic-nsswitch:/etc/resolved-nsswitch:norbind -- 2.30.2