From c76bb75147a3b5b27bc9059fb05b8940cacdfc76 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 20 Feb 2023 12:27:57 +0100 Subject: ch-equinox-t450s: fix minet connections --- roles/ws/minet/templates/connections/0xffWire.j2 | 4 ++-- roles/ws/minet/templates/connections/0xffWireless.j2 | 4 ++-- roles/ws/minet/templates/connections/elevateDomWire.j2 | 7 +------ roles/ws/minet/templates/connections/elevateForumWire.j2 | 7 +------ roles/ws/minet/templates/connections/elevateWire.j2 | 12 ++++++------ roles/ws/minet/templates/connections/pwWire.j2 | 4 +--- roles/ws/minet/templates/connections/realraumWire.j2 | 6 +----- roles/ws/minet/templates/connections/stmkgrueneWire.j2 | 12 ++++++------ 8 files changed, 20 insertions(+), 36 deletions(-) (limited to 'roles/ws') diff --git a/roles/ws/minet/templates/connections/0xffWire.j2 b/roles/ws/minet/templates/connections/0xffWire.j2 index f24a75f7..6ee38db9 100755 --- a/roles/ws/minet/templates/connections/0xffWire.j2 +++ b/roles/ws/minet/templates/connections/0xffWire.j2 @@ -13,11 +13,11 @@ case "$1" in activate_interface $INTERFACE $MODULE_NAME ifconfig $INTERFACE 10.12.233.11 netmask 255.255.0.0 olsrd -f /etc/olsrd/olsrd.wire.conf - echo "search graz.funkfeuer.at" > /etc/resolv.conf - echo "nameserver 10.12.0.10" >> /etc/resolv.conf + echo "domain graz.funkfeuer.at\nnameserver 10.12.0.10" | resolvconf -a $INTERFACE ;; stop) echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE killall olsrd deactivate_interface $INTERFACE $MODULE_NAME ;; diff --git a/roles/ws/minet/templates/connections/0xffWireless.j2 b/roles/ws/minet/templates/connections/0xffWireless.j2 index 4f282b8d..6d5de066 100755 --- a/roles/ws/minet/templates/connections/0xffWireless.j2 +++ b/roles/ws/minet/templates/connections/0xffWireless.j2 @@ -18,11 +18,11 @@ case "$1" in iw --debug $INTERFACE ibss join http://graz.funkfeuer.at/v13 2472 CA:00:24:00:C0:13 ip addr add dev $INTERFACE 10.12.233.11/16 olsrd -f /etc/olsrd/olsrd.wireless.conf - echo "search graz.funkfeuer.at" > /etc/resolv.conf - echo "nameserver 10.12.0.10" >> /etc/resolv.conf + echo "domain graz.funkfeuer.at\nnameserver 10.12.0.10" | resolvconf -a $INTERFACE ;; stop) echo "Disconnecting from $DESC_NAME" + resolvconf -d $INTERFACE killall olsrd deactivate_interface $INTERFACE $MODULE_NAME ;; diff --git a/roles/ws/minet/templates/connections/elevateDomWire.j2 b/roles/ws/minet/templates/connections/elevateDomWire.j2 index 4f579df1..471ad4ba 100755 --- a/roles/ws/minet/templates/connections/elevateDomWire.j2 +++ b/roles/ws/minet/templates/connections/elevateDomWire.j2 @@ -14,12 +14,7 @@ case "$1" in ifconfig $INTERFACE 91.143.110.174 netmask 255.255.255.240 route add default gw 91.143.110.161 ip addr add dev $INTERFACE 192.168.84.23/24 - echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv - echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv - echo "nameserver 217.29.144.65" >> /tmp/$SHORT_NAME.resolv - echo "nameserver 217.29.144.66" >> /tmp/$SHORT_NAME.resolv - resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv - rm /tmp/$SHORT_NAME.resolv + echo "domain spreadspace.org\nnameserver 217.29.144.65\nnameserver 217.29.144.66" | resolvconf -a $INTERFACE ;; stop) echo "Disconnecting from $DESC_NAME" diff --git a/roles/ws/minet/templates/connections/elevateForumWire.j2 b/roles/ws/minet/templates/connections/elevateForumWire.j2 index a770bfd8..4ba43950 100755 --- a/roles/ws/minet/templates/connections/elevateForumWire.j2 +++ b/roles/ws/minet/templates/connections/elevateForumWire.j2 @@ -14,12 +14,7 @@ case "$1" in ifconfig $INTERFACE 192.168.84.78 netmask 255.255.255.0 ip addr add dev $INTERFACE 109.73.158.78 ip route add default via 192.168.84.254 src 109.73.158.78 - echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv - echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv - echo "nameserver 217.29.144.65" >> /tmp/$SHORT_NAME.resolv - echo "nameserver 217.29.144.66" >> /tmp/$SHORT_NAME.resolv - resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv - rm /tmp/$SHORT_NAME.resolv + echo "domain spreadspace.org\nnameserver 217.29.144.65\nnameserver 217.29.144.66" | resolvconf -a $INTERFACE ;; stop) echo "Disconnecting from $DESC_NAME" diff --git a/roles/ws/minet/templates/connections/elevateWire.j2 b/roles/ws/minet/templates/connections/elevateWire.j2 index c1bee0e0..e639bcc2 100755 --- a/roles/ws/minet/templates/connections/elevateWire.j2 +++ b/roles/ws/minet/templates/connections/elevateWire.j2 @@ -20,15 +20,15 @@ case "$1" in ip addr add dev $INTERFACE.511 172.31.255.250/24 ip link set up dev $INTERFACE.511 ip route add default via 192.168.18.254 - echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv - echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv - echo "nameserver 192.168.18.254" >> /tmp/$SHORT_NAME.resolv - resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv - rm /tmp/$SHORT_NAME.resolv + #echo "domain spreadspace.org\nnameserver 192.168.18.254" | resolvconf -a $INTERFACE.18 + resolvectl dns "$INTERFACE.18" "192.168.18.254" + resolvectl domain "$INTERFACE.18" "spreadspace.org" + resolvectl default-route "$INTERFACE.18" true ;; stop) echo "Disconnecting from $DESC_NAME" - resolvconf -d $INTERFACE + #resolvconf -d $INTERFACE.18 + resolvectl revert "$INTERFACE.18" deactivate_interface $INTERFACE $MODULE_NAME ;; *) diff --git a/roles/ws/minet/templates/connections/pwWire.j2 b/roles/ws/minet/templates/connections/pwWire.j2 index f3dc6687..d3383976 100755 --- a/roles/ws/minet/templates/connections/pwWire.j2 +++ b/roles/ws/minet/templates/connections/pwWire.j2 @@ -20,9 +20,7 @@ case "$1" in ip addr add dev $INTERFACE.18 192.168.0.11/24 ip link set up dev $INTERFACE.18 ip route add default via 192.168.0.1 - echo "nameserver 192.168.0.1" >> /tmp/minet-$SHORT_NAME.resolv - resolvconf -a $INTERFACE < /tmp/minet-$SHORT_NAME.resolv - rm -f /tmp/minet-$SHORT_NAME.resolv + echo "nameserver 192.168.0.1" | resolvconf -a $INTERFACE ;; stop) echo "Disconnecting from $DESC_NAME" diff --git a/roles/ws/minet/templates/connections/realraumWire.j2 b/roles/ws/minet/templates/connections/realraumWire.j2 index 784074c6..6d0967f3 100755 --- a/roles/ws/minet/templates/connections/realraumWire.j2 +++ b/roles/ws/minet/templates/connections/realraumWire.j2 @@ -16,11 +16,7 @@ case "$1" in ip route add default via 89.106.211.33 ip -6 addr add dev $INTERFACE 2a02:3e0:4000:1::60/64 ip -6 route add default via 2a02:3e0:4000:1::1 - echo "search realraum.at" > /tmp/$SHORT_NAME.resolv - echo "domain realraum.at" >> /tmp/$SHORT_NAME.resolv - echo "nameserver 89.106.211.33" >> /tmp/$SHORT_NAME.resolv - resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv - rm /tmp/$SHORT_NAME.resolv + echo "domain realraum.at\nnameserver 89.106.211.33" | resolvconf -a $INTERFACE ;; stop) echo "Disconnecting from $DESC_NAME" diff --git a/roles/ws/minet/templates/connections/stmkgrueneWire.j2 b/roles/ws/minet/templates/connections/stmkgrueneWire.j2 index 71fc16c6..f9daeeec 100755 --- a/roles/ws/minet/templates/connections/stmkgrueneWire.j2 +++ b/roles/ws/minet/templates/connections/stmkgrueneWire.j2 @@ -17,15 +17,15 @@ case "$1" in ip link set up dev $INTERFACE.$VLAN done ip route add default via 192.168.18.254 - echo "search spreadspace.org" > /tmp/$SHORT_NAME.resolv - echo "domain spreadspace.org" >> /tmp/$SHORT_NAME.resolv - echo "nameserver 192.168.18.254" >> /tmp/$SHORT_NAME.resolv - resolvconf -a $INTERFACE < /tmp/$SHORT_NAME.resolv - rm /tmp/$SHORT_NAME.resolv + #echo "domain spreadspace.org\nnameserver 192.168.18.254" | resolvconf -a $INTERFACE.18 + resolvectl dns "$INTERFACE.18" "192.168.18.254" + resolvectl domain "$INTERFACE.18" "spreadspace.org" + resolvectl default-route "$INTERFACE.18" true ;; stop) echo "Disconnecting from $DESC_NAME" - resolvconf -d $INTERFACE + #resolvconf -d $INTERFACE.18 + resolvectl revert "$INTERFACE.18" deactivate_interface $INTERFACE $MODULE_NAME ;; *) -- cgit v1.2.3