From 0a4e4b13ec39064ca6d20178606c7aaa45b2f361 Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sat, 9 Apr 2016 15:54:23 +0200
Subject: [PATCH 1/4] Remove Alfred

---
 install.sn.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/install.sn.yml b/install.sn.yml
index 2e0c971..e4389dc 100644
--- a/install.sn.yml
+++ b/install.sn.yml
@@ -145,14 +145,6 @@
     - name: Install batctl
       shell: cd /tmp/batctl && git checkout {{ batmanversion }} && make && make install
       when: getbatctl.changed
-    - name: Get alfred
-      git: repo=http://git.open-mesh.org/alfred.git
-           dest=/tmp/alfred
-      when: aptupdates.changed
-      register: getalfred
-    - name: Install alfred
-      shell: cd /tmp/alfred && git checkout {{ batmanversion }} && make && make install
-      when: getalfred.changed
     - name: Get Tunneldigger
 #      git: repo=https://github.com/wlanslovenija/tunneldigger.git
       git: repo=https://github.com/ffrl/tunneldigger.git

From 1ef6bd8b52de0d690ce3491f1f0372cc22d7978b Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sat, 9 Apr 2016 15:55:01 +0200
Subject: [PATCH 2/4] Delete alfred.sh.j2

---
 files/alfred.sh.j2 | 51 ----------------------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 files/alfred.sh.j2

diff --git a/files/alfred.sh.j2 b/files/alfred.sh.j2
deleted file mode 100644
index bc03367..0000000
--- a/files/alfred.sh.j2
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-release=$(/bin/uname -r)
-nodeid=$( /bin/echo {{ sn_mesh_MAC }} | /bin/sed s/://g)
-#meshh_if=$(/bin/cat /sys/class/net/troisdorf*/address | /bin/grep -v ^00:00:00)
-meshh_if=$(/bin/cat /sys/class/net/l2tp*/address | /bin/grep -v ^00:00:00)
-tempfile=/tmp/alfred_info
-
-if [ -f $tempfile ]
- then
-  /bin/rm $tempfile
-fi
-
-/bin/cat > $tempfile <<EOF
-{
-"network": {
-"mac": "{{ sn_mesh_MAC }}",
-"addresses": [
-"{{ sn_mesh_IPv6 }}",
-"{{ sn_mesh_IPv4 }}"
-],
-"mesh_interfaces": [
-$(for i in $meshh_if; do /bin/echo '"'$i'",';done)
-"{{ ul_mesh_MAC }}",
-"{{ sn_mesh_MAC }}"
-]
-},
-"vpn": true,
-"node_id": "$nodeid",
-"hostname": "Gateway:{{ sn_hostname }}",
-"hardware": {
-"model": "vServer"
-},
-"owner": {
-"contact": "stefan@freifunk-troisdorf.de"
-}
-}
-EOF
-
-if [ -f $tempfile ]
- then
-  /bin/cat "$tempfile" | /bin/gzip | /usr/local/sbin/alfred -s 158
-fi
-
-if [ -f $tempfile ]
- then
-  /bin/rm $tempfile
-fi
-
-exit 0
-

From 3abe240a97ce86210e397fa370f1e26a3f2182b7 Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sat, 9 Apr 2016 15:55:53 +0200
Subject: [PATCH 3/4] Update l2tp_backbone.sh.exit.j2

---
 files/l2tp_backbone.sh.exit.j2 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/files/l2tp_backbone.sh.exit.j2 b/files/l2tp_backbone.sh.exit.j2
index 6a64c91..2e84c60 100644
--- a/files/l2tp_backbone.sh.exit.j2
+++ b/files/l2tp_backbone.sh.exit.j2
@@ -20,7 +20,6 @@ octet3rd="255"
 # CIDR muss /16 sein
 localserver=$(/bin/hostname)
 batadv=/usr/local/sbin/batadv-vis
-alfred=/usr/local/sbin/alfred
 batctl=/usr/local/sbin/batctl
 ip=/sbin/ip
 dig=/usr/bin/dig
@@ -48,10 +47,7 @@ $ip link set up dev bat0
 $ip addr add $communitynetwork.$octet3rd.${localserver#$communityname}/16 broadcast $communitynetwork.255.255 dev bat0
 $ip -6 addr add $communitynetworkv6$octet3rd:${localserver#$communityname}/64 dev bat0
 
-/usr/bin/killall alfred
 /usr/bin/killall batadv-vis
-/bin/sleep 5
-$alfred -i bat0 > /dev/null 2>&1 &
 /bin/sleep 15
 $batadv -i bat0 -s > /dev/null 2>&1 &
 #/bin/systemctl restart isc-dhcp-server

From d2563e8c7aacad6d7e01caf932ff71d9cb1f076f Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Sat, 9 Apr 2016 15:56:22 +0200
Subject: [PATCH 4/4] Update l2tp_backbone.sh.j2

---
 files/l2tp_backbone.sh.j2 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/files/l2tp_backbone.sh.j2 b/files/l2tp_backbone.sh.j2
index 483bdd3..82dd19c 100644
--- a/files/l2tp_backbone.sh.j2
+++ b/files/l2tp_backbone.sh.j2
@@ -20,7 +20,6 @@ octet3rd="255"
 # CIDR muss /16 sein
 localserver=$(/bin/hostname)
 batadv=/usr/local/sbin/batadv-vis
-alfred=/usr/local/sbin/alfred
 batctl=/usr/local/sbin/batctl
 ip=/sbin/ip
 dig=/usr/bin/dig
@@ -49,10 +48,7 @@ $ip link set up dev bat0
 $ip addr add $communitynetwork.$octet3rd.${localserver#$communityname}/16 broadcast $communitynetwork.255.255 dev bat0
 $ip -6 addr add $communitynetworkv6$octet3rd:${localserver#$communityname}/64 dev bat0
 
-/usr/bin/killall alfred
 /usr/bin/killall batadv-vis
-/bin/sleep 5
-$alfred -i bat0 > /dev/null 2>&1 &
 /bin/sleep 15
 $batadv -i bat0 -s > /dev/null 2>&1 &
 /usr/sbin/service bind9 restart