From 07eda681ca48afb3c9dda6cbf4008b25fae46db5 Mon Sep 17 00:00:00 2001
From: Tobias Hachmer <tobias@hachmer.de>
Date: Sun, 12 Nov 2017 14:12:07 +0100
Subject: [PATCH] Roles service-fastd-mesh + service-fastd-intragate

- remove on-up|on-down stanzas from fastd.conf
- update readme
---
 .../templates/fastd-intragate.conf.j2              | 14 --------------
 roles/service-fastd-mesh/README.md                 |  1 +
 .../templates/fastd-mesh.conf.j2                   | 14 --------------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/roles/service-fastd-intragate/templates/fastd-intragate.conf.j2 b/roles/service-fastd-intragate/templates/fastd-intragate.conf.j2
index fa068ac..a97bd4d 100644
--- a/roles/service-fastd-intragate/templates/fastd-intragate.conf.j2
+++ b/roles/service-fastd-intragate/templates/fastd-intragate.conf.j2
@@ -1,5 +1,3 @@
-{% set ip4hex = item.0.ipv4_network | ipaddr('net') | ipaddr(magic) | ipaddr('address') | ip4_hex() -%}
-{% set mac = '023' + item.1.id|string + ip4hex -%}
 #
 # {{ ansible_managed }}
 #
@@ -22,16 +20,4 @@ peer group "servers" {
     include peers from "peers/services";
 }
 
-on up "
-    ip link set $INTERFACE down
-    ip link set address {{ mac | hwaddr('linux') }} dev $INTERFACE
-    ip link set $INTERFACE up
-
-    batctl -m {{ item.0.id }}bat if add $INTERFACE
-";
-
-on down "
-    batctl -m {{ item.0.id }}bat if del $INTERFACE
-";
-
 status socket "/var/run/fastd-{{ item.0.id }}igvpn-{{ item.1.mtu }}.status";
diff --git a/roles/service-fastd-mesh/README.md b/roles/service-fastd-mesh/README.md
index 78b4ad4..1f33875 100644
--- a/roles/service-fastd-mesh/README.md
+++ b/roles/service-fastd-mesh/README.md
@@ -40,6 +40,7 @@ fastd_secrets:
   ...
 
 ´´´
+- Liste `legacy_gateways`
 
 ## fastd Secrets
 
diff --git a/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2 b/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2
index a9954bc..aa8a640 100644
--- a/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2
+++ b/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2
@@ -1,5 +1,3 @@
-{% set ip4hex = item.0.ipv4_network | ipaddr('net') | ipaddr(magic) | ipaddr('address') | ip4_hex() -%}
-{% set mac = '022' + item.1.id|string + ip4hex -%}
 #
 # {{ ansible_managed }}
 #
@@ -29,16 +27,4 @@ peer group "servers" {
     include peers from "peers/servers";
 }
 
-on up "
-    ip link set $INTERFACE down
-    ip link set address {{ mac | hwaddr('linux') }} dev $INTERFACE
-    ip link set $INTERFACE up
-
-    batctl -m {{ item.0.id }}bat if add $INTERFACE
-";
-
-on down "
-    batctl -m {{ item.0.id }}bat if del $INTERFACE
-";
-
 status socket "/var/run/fastd-{{ item.0.id }}vpn-{{ item.1.mtu }}.status";