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 < /dev/null 2>&1 & /bin/sleep 15 $batadv -i bat0 -s > /dev/null 2>&1 & #/bin/systemctl restart isc-dhcp-server 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 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