From 8c49f647b380872ff59b076d21796197eb5ad258 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 13 Mar 2021 13:20:40 +0100
Subject: ele-tub: simpler setup for 60GHz link tests

---
 inventory/host_vars/ele-tub.yml | 60 ++---------------------------------------
 1 file changed, 2 insertions(+), 58 deletions(-)

(limited to 'inventory/host_vars/ele-tub.yml')

diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml
index 2655a98f..2f843d29 100644
--- a/inventory/host_vars/ele-tub.yml
+++ b/inventory/host_vars/ele-tub.yml
@@ -4,7 +4,7 @@ ssh_users_root:
   - datacop
 
 openwrt_variant: openwrt
-openwrt_release: 19.07.1
+openwrt_release: 19.07.7
 openwrt_arch: x86
 openwrt_target: geode
 openwrt_profile: Generic
@@ -45,50 +45,6 @@ openwrt_mixin:
   /etc/htoprc:
     file: "{{ global_files_dir }}/common/htoprc"
 
-  /etc/rc.local: |
-    # Put your custom commands here that should be executed once
-    # the system init finished. By default this file does nothing.
-
-    PUBLIC_IP=193.33.151.58 # Hier die zugewiesene public IP eintragen
-    PUBLIC_GW=10.12.34.56
-
-    ip tunnel add public mode ipip remote $PUBLIC_GW local $PUBLIC_IP ttl 255
-    ip link set public up
-    ip addr add $PUBLIC_IP dev public
-    ip route add default dev public table default
-
-    ip rule add from all lookup 111 pref 20000
-    ip rule add from all lookup main pref 30000
-    ip rule del pref 32766
-
-    UHRTURM_IF=$(uci get network.uhrturm.ifname)
-    ip rule add iif "$UHRTURM_IF" lookup 120 pref 31000
-    ip route add default via {{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets['ele-mur']) | ipaddr('address') }} table 120
-
-    iptables -t nat -A POSTROUTING -o public -j MASQUERADE
-    iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o public -j TCPMSS --clamp-mss-to-pmtu
-
-    source /lib/functions/network.sh
-
-    i=0
-    while iface="$( uci -q get olsrd.@Interface[$i].interface )"; do
-      case "$( uci -q get olsrd.@Interface[$i].ignore )" in
-        1|on|true|enabled|yes)
-          # is disabled
-        ;;
-        *)
-          if network_get_device device "$iface"; then
-            ip rule add iif $device pref $(( i + 32000 )) lookup 112
-          else
-            echo "Warning: device for OLSR Interface '$interface' not found, skipped"
-          fi
-        ;;
-      esac
-      i=$(( $i + 1 ))
-    done
-
-    exit 0
-
 
 openwrt_uci:
   system:
@@ -149,18 +105,6 @@ openwrt_uci:
         netmask: 255.255.0.0
         dns: "{{ network_zones.funkfeuer.dns }}"
 
-    - name: interface 'murattransfer'
-      options:
-        ifname: eth2
-        proto: static
-        ipaddr: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address') }}"
-        netmask: "{{ network_zones.murat_transfer.prefix | ipaddr('netmask') }}"
-
-    - name: interface 'public'
-      options:
-        ifname: public
-        proto: none
-
   olsrd:
     - name: olsrd
       options:
@@ -185,7 +129,7 @@ openwrt_uci:
     - name: Interface
       options:
         interface:
-          - ff
+        - ff
         IPv4Src: 10.12.91.28
 
     - name: Hna4
-- 
cgit v1.2.3