Change to super node and exit node in one server

files/keepalive.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Version 1.5
+# Version 1.6
 # Parameter setzen
 GATEWAY1ext=185.66.193.105
 GATEWAY2ext=185.66.193.106
@@ -24,7 +24,7 @@ if [ $(hostname) = "troisdorf1" ] || [ $(hostname) = "troisdorf2" ]
         DEFAULT_GATEWAY=$GATEWAY2
 	DEFAULT_GATEWAYext=$GATEWAY2ext
         FALLBACK_GATEWAY=$GATEWAY1
-        FALLBACK_GATEWAY=$GATEWAY1ext
+        FALLBACK_GATEWAYext=$GATEWAY1ext
 	DEFAULT_GATEWAYv6=$GATEWAY2v6
 	FALLBACK_GATEWAYv6=$GATEWAY1v6
 

files/l2tp_backbone.sh.exit.j2

@@ -2,8 +2,8 @@
 # Version 6
 # Der servername muss mit einer einstelligen Zahl aufhoeren!!!!!
 communityname="troisdorf"
-#server="troisdorf1 troisdorf2 troisdorf3 troisdorf4 troisdorf5 troisdorf6 troisdorf7 troisdorf8 troisdorf9"
+server="troisdorf1 troisdorf2 troisdorf3 troisdorf4 troisdorf5 troisdorf6 troisdorf7 troisdorf8 troisdorf9"
-server="troisdorf7 {{ sn_hostname }}"
+#server="troisdorf7 {{ sn_hostname }}"
 domain="freifunk-troisdorf.de"
 mtu={{ sn_mtu }}
 # community MAC address, without the last Byte (:)!
@@ -55,4 +55,5 @@ $alfred -i bat0 > /dev/null 2>&1 &
 /bin/sleep 15
 $batadv -i bat0 -s > /dev/null 2>&1 &
 /usr/sbin/service bind9 restart
-/usr/local/sbin/batctl gw client 3
+#/usr/local/sbin/batctl gw client 3
+/usr/local/sbin/batctl gw server 100Mbit/100Mbit

files/sn_startup.exit.sh.j2

@@ -45,6 +45,12 @@ done
 # Allow MAC address spoofing
 /sbin/sysctl net.ipv4.conf.bat0.rp_filter=0
 
+# Create Tunneldigger Bridge
+/sbin/brctl addbr br-nodes
+/sbin/ip link set dev br-nodes up
+/sbin/ebtables -A FORWARD --logical-in br-nodes -j DROP
+/usr/local/sbin/batctl if add br-nodes
+
 sleep 5
 
 # stop tunneldigger
@@ -65,4 +71,16 @@ sleep 5
 /bin/systemctl disable isc-dhcp-server
 /bin/systemctl stop isc-dhcp-server
 
+# Start tunneldigger
+/bin/systemctl restart tunneldigger
+/bin/systemctl enable tunneldigger
+
+# radvd restart
+/bin/systemctl restart radvd
+/bin/systemctl enable radvd
+
+# restart DHCP
+/bin/systemctl restart isc-dhcp-server
+/bin/systemctl enable isc-dhcp-server
+
 exit 0

install.sn.yml

@@ -9,7 +9,7 @@
   user: root
   gather_facts: False
   vars:
-    snversion: master_v2.1
+    snversion: master_v2.9000001_beta
     batmanversion: v2015.2
     common_required_packages:
       - git
@@ -71,8 +71,8 @@
       raw: "sed -i '/deb cdrom/c\\#' /etc/apt/sources.list"
     - name: Make this server ansible compatible
       raw: "apt-get update && apt-get install python -y"
-    - name: Add backport repo to source list #target: /etc/apt/sources.list.d
+#    - name: Add backport repo to source list #target: /etc/apt/sources.list.d
-      apt_repository: repo='deb http://http.debian.net/debian jessie-backports main' state=present 
+#      apt_repository: repo='deb http://http.debian.net/debian jessie-backports main' state=present 
     - name: Update apt cache
       apt: update_cache=yes
     - name: Gathering facts
@@ -196,7 +196,7 @@
       copy: src=./files/{{ item }} dest=/opt/freifunk owner=root group=root mode=0500
       with_items: check_gw_script
       register: check_gw
-      when: sn_exit is undefined
+#      when: sn_exit 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
@@ -205,7 +205,7 @@
       copy: src=./files/{{ item }} dest=/opt/freifunk owner=root group=root mode=0500
       with_items: tunneld_stats_file
       register: tunneld_stats
-      when: sn_exit is undefined
+#      when: sn_exit is undefined
     - name: Add cron job tunneldigger stats
       cron: name=tunneld_stats job="/opt/freifunk/collectd_td_stat.sh > /dev/null 2>&1" user="root"
       when: tunneld_stats.changed