From cc173ba8c5fd85686eef4c764fc91bf7c1c039c4 Mon Sep 17 00:00:00 2001 From: Ansible Admin Date: Tue, 22 Dec 2015 20:30:16 +0100 Subject: [PATCH] central MTU management --- files/dhcpd.conf.j2 | 6 +++++- files/gre_backbone.sh.j2 | 2 +- files/l2tp_backbone.sh.j2 | 2 +- files/l2tp_backbone_ffswitch.sh.j2 | 2 +- install.sn.yml | 23 +++++++---------------- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/files/dhcpd.conf.j2 b/files/dhcpd.conf.j2 index 95998d0..060cced 100644 --- a/files/dhcpd.conf.j2 +++ b/files/dhcpd.conf.j2 @@ -1,3 +1,4 @@ +# Version 1.2 ddns-update-style none; option domain-name "fftdf"; default-lease-time 300; @@ -9,6 +10,9 @@ range {{ sn_dhcp_range }}; option domain-name-servers {{ sn_mesh_IPv4 }}, {{ sn_dhcp_dns }}; option routers {{ sn_dhcp_router }}; interface bat0; - +} +host database { + hardware ethernet 5e:51:68:d6:6a:69; + fixed-address 10.188.1.27; } diff --git a/files/gre_backbone.sh.j2 b/files/gre_backbone.sh.j2 index 8c1e16f..b4af165 100644 --- a/files/gre_backbone.sh.j2 +++ b/files/gre_backbone.sh.j2 @@ -3,7 +3,7 @@ communityname="troisdorf" server="troisdorf0 {{ sn_hostname }}" domain="freifunk-troisdorf.de" -mtu=1500 +mtu={{ sn_mtu }} # community MAC address, without the last Byte (:)! communitymacaddress="a2:8c:ae:6f:f6" # Network part of the network, without the trailing dot diff --git a/files/l2tp_backbone.sh.j2 b/files/l2tp_backbone.sh.j2 index bdbd65c..d5ec362 100644 --- a/files/l2tp_backbone.sh.j2 +++ b/files/l2tp_backbone.sh.j2 @@ -5,7 +5,7 @@ communityname="troisdorf" server="troisdorf1 troisdorf2 troisdorf3 troisdorf4 troisdorf5 troisdorf6 troisdorf7 troisdorf8 troisdorf9" #server="troisdorf0 {{ sn_hostname }}" domain="freifunk-troisdorf.de" -mtu=1400 +mtu={{ sn_mtu }} # community MAC address, without the last Byte (:)! communitymacaddress="a2:8c:ae:6f:f6" tunnelPrefix=10 diff --git a/files/l2tp_backbone_ffswitch.sh.j2 b/files/l2tp_backbone_ffswitch.sh.j2 index 8f2a2a3..abb5702 100644 --- a/files/l2tp_backbone_ffswitch.sh.j2 +++ b/files/l2tp_backbone_ffswitch.sh.j2 @@ -5,7 +5,7 @@ communityname="troisdorf" server="troisdorf0 troisdorf1 troisdorf2 troisdorf3 troisdorf4 troisdorf5 troisdorf6 troisdorf7 troisdorf8 troisdorf9" #server="troisdorf0 {{ sn_hostname }}" domain="freifunk-troisdorf.de" -mtu=1400 +mtu={{ sn_mtu }} # community MAC address, without the last Byte (:)! communitymacaddress="a2:8c:ae:6f:f6" tunnelPrefix=10 diff --git a/install.sn.yml b/install.sn.yml index 23cf2e1..8c9aabb 100644 --- a/install.sn.yml +++ b/install.sn.yml @@ -9,7 +9,7 @@ user: root gather_facts: False vars: - snversion: master_v1.8 + snversion: master_v1.8.3 batmanversion: v2015.2 common_required_packages: - git @@ -126,7 +126,8 @@ when: aptupdates.changed register: getbatman - name: Get batman-adv no rebrotcast patch - get_url: url=http://map.freifunk-moehne.de/stuff/1001-batman-adv-introduce-no_rebroadcast-option.patch dest=/tmp/batman-adv/1001-batman-adv-introduce-no_rebroadcast-option.patch + get_url: url=http://map.freifunk-moehne.de/stuff/1001-batman-adv-introduce-no_rebroadcast-option.patch dest=/tmp/batman-adv/1001-batman-adv-introduce-no_rebroadcast-option.patch + when: getbatman.changed - name: Install batman-adv shell: cd /tmp/batman-adv && git checkout {{ batmanversion }} && make && make install # shell: cd /tmp/batman-adv && git checkout {{ batmanversion }} && git apply 1001-batman-adv-introduce-no_rebroadcast-option.patch && make && make install @@ -152,7 +153,6 @@ dest=/srv/tunneldigger register: tunneldigger when: aptupdates.changed -# when: ffswitch is undefined - name: Configure tunneldigger command: "{{item}}" with_items: @@ -190,25 +190,21 @@ copy: src=./files/{{ item }} dest=/opt/freifunk owner=root group=root mode=0500 with_items: check_gw_script register: check_gw -# when: ffswitch is undefined - name: Add cron job with check gateway script cron: name=check_gw job="/opt/freifunk/keepalive.sh > /dev/null 2>&1" user="root" when: check_gw.changed -# when: ffswitch is undefined - name: Copy dhcpd template file template: src=./files/dhcpd.conf.j2 dest=/etc/dhcp/dhcpd.conf owner=root group=root mode=0444 -# when: ffswitch is undefined + register: dhcpd + - name: Restart dhcpd + service: name=isc-dhcp-server state=restarted + when: dhcpd.changed - name: Add cron backbone script cron: name=backbone special_time=reboot job="/opt/freifunk/l2tp_backbone.sh" - name: Add cron startup script cron: name=startup special_time=reboot job="/opt/freifunk/sn_startup.sh" - name: Copy backbone script template: src=./files/l2tp_backbone.sh.j2 dest=/opt/freifunk/l2tp_backbone.sh owner=root group=root mode=0544 -# when: ffswitch is undefined -# - name: Copy backbone script -# template: src=./files/l2tp_backbone_ffswitch.sh.j2 dest=/opt/freifunk/l2tp_backbone.sh owner=root group=root mode=0544 -# when: ffswitch is defined -# register: ffswitchl2tp - name: Collectd template file template: src=./files/collectd.conf.j2 dest=/etc/collectd/collectd.conf owner=root group=root mode=0444 register: collectd @@ -223,16 +219,12 @@ - name: Copy secondary zone file copy: src=./files/{{ item }} dest=/etc/bind owner=root group=bind mode=644 with_items: bind_zone_fftdf -# when: ffswitch is undefined - name: Bind9, activate fftdf zone lineinfile: dest=/etc/bind/named.conf line='include "/etc/bind/named.conf.fftdf";' state=present -# when: ffswitch is undefined - name: Copy option template template: src=./files/named.conf.options.j2 dest=/etc/bind/named.conf.options owner=root group=bind mode=644 -# when: ffswitch is undefined - name: Copy radvd config template template: src=./files/radvd.conf.j2 dest=/etc/radvd.conf owner=radvd group=root mode=0444 -# when: ffswitch is undefined - name: Alfed message template: src=./files/alfred.sh.j2 dest=/opt/freifunk/alfred.sh owner=root group=root mode=0544 - name: Add cron job with alfred info script @@ -243,7 +235,6 @@ poll: 0 ignore_errors: true when: tunneldigger.changed -# when: ffswitchl2tp.changed - name: Wirte version information shell: touch /etc/sn_version && echo {{ snversion }} > /etc/sn_version - name: waiting for server to come back