summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dan/host_vars/ele-tub.yml8
-rw-r--r--inventory/host_vars/ele-tub.yml60
2 files changed, 2 insertions, 66 deletions
diff --git a/dan/host_vars/ele-tub.yml b/dan/host_vars/ele-tub.yml
deleted file mode 100644
index 7572e06c..00000000
--- a/dan/host_vars/ele-tub.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
-34613530333863316463333336613034343333376262373138643461373739333261353565333539
-3531653366633736343436643639396435396134316662340a643239363433353438356539373439
-39373839393663353036353131653331653737616365306266393538366564633064326537393261
-3334653866363263370a383838323535623362343666376366336638323536626235316535376466
-39393132626135306330613835343464386430613137323331653864633136623963346662373866
-30336465303634326265316134363365643734313962623163343137373337396630623533336537
-376534303937663361346538306531653262
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