From 4254a646e999d775944f79b944d38d85fbcc3168 Mon Sep 17 00:00:00 2001 From: Ansible Admin Date: Sun, 6 Mar 2016 12:52:37 +0100 Subject: [PATCH] Add direct routing (external IPv4 via internal mesh) smaller improvements --- files/interfaces-troisdorf5 | 2 -- files/interfaces-troisdorf6 | 2 -- files/sn_startup.exit.sh.j2 | 4 +++- install.sn.yml | 19 +++++++++++++------ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/files/interfaces-troisdorf5 b/files/interfaces-troisdorf5 index 8170c7f..37a0421 100644 --- a/files/interfaces-troisdorf5 +++ b/files/interfaces-troisdorf5 @@ -15,8 +15,6 @@ iface lo inet6 loopback # The primary network interface allow-hotplug eth0 iface eth0 inet dhcp - post-up ip route add 185.66.193.106/32 via 10.188.255.6 table 42 - post-up ip route add 185.66.193.106/32 via 10.188.255.6 allow-hotplug eth1 iface eth1 inet6 static address 2a01:4f8:161:62a9::5 diff --git a/files/interfaces-troisdorf6 b/files/interfaces-troisdorf6 index bea4e88..a423081 100644 --- a/files/interfaces-troisdorf6 +++ b/files/interfaces-troisdorf6 @@ -20,8 +20,6 @@ iface eth0 inet static netmask 255.255.255.192 gateway 46.4.138.129 dns-nameserver 213.133.100.100 213.133.99.99 213.133.98.98 - post-up ip route add 185.66.193.105/32 via 10.188.255.5 table 42 - post-up ip route add 185.66.193.105/32 via 10.188.255.5 iface eth0 inet6 static address 2a01:4f8:11d:600::189 diff --git a/files/sn_startup.exit.sh.j2 b/files/sn_startup.exit.sh.j2 index 0d3fd8a..c5befcc 100644 --- a/files/sn_startup.exit.sh.j2 +++ b/files/sn_startup.exit.sh.j2 @@ -1,5 +1,5 @@ #!/bin/sh -# Version 1.9 +# Version 1.91 curl -X POST --data-urlencode 'payload={"text": "{{ sn_hostname }} is rebooted", "channel": "#technik", "username": "{{ sn_hostname }}", "icon_emoji": ":floppy_disk:"}' https://hooks.slack.com/services/{{ slack_token }} @@ -49,6 +49,8 @@ done /sbin/ip link set dev br-nodes up address 2E:9D:FA:A1:6B:0{{ sn_number }} /sbin/ebtables -A FORWARD --logical-in br-nodes -j DROP /usr/local/sbin/batctl if add br-nodes +/sbin/ip route add {{ snx_ffrl_IPv4 }}/32 via {{ snx_mesh_IPv4 }} table 42 +/sbin/ip route add {{ snx_ffrl_IPv4 }}/32 via {{ snx_mesh_IPv4 }} sleep 5 diff --git a/install.sn.yml b/install.sn.yml index a9ac159..2e0c971 100644 --- a/install.sn.yml +++ b/install.sn.yml @@ -9,7 +9,7 @@ user: root gather_facts: False vars: - snversion: master_v3.0.3 + snversion: master_v3.0.4 batmanversion: v2015.2 common_required_packages: - git @@ -278,12 +278,19 @@ copy: src=./files/bird6-{{ sn_hostname }}.conf dest=/etc/bird/bird6.conf owner=bird group=bird mode=0444 when: sn_exit is defined - name: set netfilter rules - lineinfile: dest=/etc/sysctl.conf line={{ item }} + lineinfile: dest=/etc/sysctl.conf line="{{ item }}" with_items: - - "net.ipv4.netfilter.ip_conntrack_generic_timeout = 240" - - "net.ipv4.netfilter.ip_conntrack_tcp_timeout_established = 54000" - - "net.netfilter.nf_conntrack_max = 262144" - - lineinfile: dest=/etc/modprobe.conf line="options ip_conntrack hashsize=65536" + - net.ipv4.netfilter.ip_conntrack_generic_timeout = 240 + - net.ipv4.netfilter.ip_conntrack_tcp_timeout_established = 54000 + - net.netfilter.nf_conntrack_max = 262144 + - name: check modprobe.conf + stat: path=/etc/modprobe.conf + register: modprobe1 + - name: create /etc/modprobe.conf when not present + file: path=/etc/modprobe.conf state=touch owner=root group=root mode=0544 + when: modprobe1.stat.exists == False + - name: check /etc/modprobe.conf + lineinfile: dest=/etc/modprobe.conf line="options ip_conntrack hashsize=65536" - name: Reboot the server finally shell: sleep 2 && shutdown -r now "Ansible updates triggered" async: 1