From 6d016c034c64a45063f144b826af1aed20c9a843 Mon Sep 17 00:00:00 2001
From: Julian Labus <julian@labus-online.de>
Date: Tue, 5 Feb 2019 15:18:48 +0100
Subject: [PATCH] Role service-fastd-mesh: remove peers-ffbin

remove the individual peers repo for ffbin after successful migration to
the multidomain firmware
---
 roles/service-fastd-mesh/README.md            |  1 -
 roles/service-fastd-mesh/tasks/main.yml       | 20 -------------------
 .../templates/fastd-mesh.conf.j2              |  3 ---
 3 files changed, 24 deletions(-)

diff --git a/roles/service-fastd-mesh/README.md b/roles/service-fastd-mesh/README.md
index 013d484..fced508 100644
--- a/roles/service-fastd-mesh/README.md
+++ b/roles/service-fastd-mesh/README.md
@@ -8,7 +8,6 @@ Diese Ansible role konfiguriert die fastd-Instanz für die Knoten Kommunikation.
   - der private fastd Schlüssel wird aus dem Admin passwordstore gelesen (YAML key secret)
 - erstellt die erforderlichen peers Ordner
 - klont die fastd peer repos
-- klont bingener fastd peer repo (im Moment hardcoded)
 
 ## Instanz-Benamung
 - Node-Instanzen: _$mesh.id_ + vpn + '-' + _$mesh.fastd.nodes.instances.xx.mtu_, z.B. "mzvpn-1312"
diff --git a/roles/service-fastd-mesh/tasks/main.yml b/roles/service-fastd-mesh/tasks/main.yml
index 3f64891..37fc1dd 100644
--- a/roles/service-fastd-mesh/tasks/main.yml
+++ b/roles/service-fastd-mesh/tasks/main.yml
@@ -15,16 +15,6 @@
     group: admin
   loop: "{{ meshes | subelements('fastd.nodes.instances') }}"
 
-- name: create fastd peer mesh directories for ffbin
-  file:
-    path: "/etc/fastd/mzvpn-{{ item }}/peers_bingen"
-    state: directory
-    mode: 0755
-    owner: admin
-    group: admin
-  loop:
-    - 1406
-
 - name: clone fastd peer mesh repos
   git:
     repo: "{{ item.1.peers.repo }}"
@@ -34,16 +24,6 @@
   loop: "{{ meshes | subelements('fastd.nodes.instances') }}"
   become: false
 
-- name: clone fastd peer mesh repo for ffbin
-  git:
-    repo: https://github.com/freifunk-bingen/peers-ffbin.git
-    dest: "/etc/fastd/mzvpn-{{ item }}/peers_bingen"
-    version: master
-    update: no
-  loop:
-    - 1406
-  become: false
-
 - name: template fastd mesh config
   template:
     src: fastd-mesh.conf.j2
diff --git a/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2 b/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2
index 4fa95d8..e36e424 100644
--- a/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2
+++ b/roles/service-fastd-mesh/templates/fastd-mesh.conf.j2
@@ -22,9 +22,6 @@ mtu {{ item.1.mtu }};
 peer group "vpn_nodes" {
     include "peer_limit.conf";
     include peers from "peers";
-{% if item.0.id == "mz" %}
-    include peers from "peers_bingen";
-{% endif %}
 }
 
 on up "/bin/systemctl reload networking";