From 90de6cebbee376050ff99d00437dcb0e3940f4f4 Mon Sep 17 00:00:00 2001
From: Bastian Maeuser <mephisto@mephis.to>
Date: Mon, 9 Jul 2018 22:38:49 +0200
Subject: [PATCH] Yanic Update, changes to Config file, yanicToyanic config

---
 group_vars/all/vars.yml              |  1 +
 roles/yanic/defaults/main.yml        |  6 +++-
 roles/yanic/templates/config.toml.j2 | 45 ++++++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index be01623..2ba249b 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -31,4 +31,5 @@ ntp_servers:
 - 2.de.pool.ntp.org
 - 3.de.pool.ntp.org
 
+site: ffrgb
 site_domain: regensburg.freifunk.net
diff --git a/roles/yanic/defaults/main.yml b/roles/yanic/defaults/main.yml
index 537b44e..2bd72d0 100644
--- a/roles/yanic/defaults/main.yml
+++ b/roles/yanic/defaults/main.yml
@@ -3,6 +3,7 @@
 yanic_publisher: false
 yanic_respondd: true
 yanic_respondd_collect_interval: "1m"
+yanic_respondd_synchronize_interval: "1m"
 yanic_respondd_interface: "br-{{ site_code }}"
 
 yanic_webserver: false
@@ -27,8 +28,11 @@ yanic_meshviewer_graph: "{{yanic_meshviewer_path}}/graph.json"
 yanic_database_delete_after: "7d"
 yanic_database_delete_interval: "1h"
 
+yanic_repondd_enable: true
+yanic_repondd_remotehost: "[2a01:4f8:173:2919::2]:10001"
+
 yanic_influxdb:
-- enable: true
+- enable: false
   host: http://88.99.2.28:8086
   database: ffrgb
   username: ""
diff --git a/roles/yanic/templates/config.toml.j2 b/roles/yanic/templates/config.toml.j2
index 851aed1..310d789 100644
--- a/roles/yanic/templates/config.toml.j2
+++ b/roles/yanic/templates/config.toml.j2
@@ -2,8 +2,18 @@
 [respondd]
 enable           = {{ yanic_respondd | ternary('true','false') }}
 collect_interval = "{{ yanic_respondd_collect_interval }}"
-interfaces       = ["{{ yanic_respondd_interface }}"]
-sites            = []
+synchronize      = "{{ yanic_respondd_synchronize_interval }}"
+
+[respondd.sites.ffrgb]
+domains            = ["{{ site_code }}"]
+
+# interface that has an IP in your mesh network
+[[respondd.interfaces]]
+ifname = "br-{{ site_code }}"
+#ip_address = "{{ batman_ipv6 | ipaddr('address') }}"
+#send_no_request = false
+#multicast_address = "ff05::2:1001"
+#port = 10001
 
 [webserver]
 enable  = {{ yanic_webserver | ternary('true','false') }}
@@ -20,12 +30,34 @@ offline_after  = "{{ yanic_nodes_offline_after }}"
 enable  = {{ yanic_meshviewer_ffrgb_enable | ternary('true','false') }}
 path    = "{{ yanic_meshviewer_ffrgb_path }}"
 
+[nodes.output.meshviewer-ffrgb.filter]
+no_owner = true
+blacklist = []
+sites = ["ffrgb"]
+has_location = true
+
+#[nodes.output.meshviewer-ffrgb.filter.in_area]
+#latitude_min = 34.30
+#latitude_max = 71.85
+#longitude_min = -24.96
+#longitude_max = 39.72
+
 [[nodes.output.meshviewer]]
 enable         = {{ yanic_meshviewer_enable | ternary('true','false') }}
 version        = {{ yanic_meshviewer_version }}
 nodes_path     = "{{ yanic_meshviewer_nodes }}"
 graph_path     = "{{ yanic_meshviewer_graph }}"
 
+[nodes.output.meshviewer.filter]
+no_owner = true
+
+[[nodes.output.nodelist]]
+enable   = false
+path = "/var/www/html/meshviewer/data/nodelist.json"
+
+[nodes.output.nodelist.filter]
+no_owner = true
+
 [database]
 delete_after = "{{ yanic_database_delete_after }}"
 delete_interval = "{{ yanic_database_delete_interval }}"
@@ -47,3 +79,12 @@ enable   = {{ db.enable | ternary('true','false') }}
 address  = "{{ db.address }}"
 prefix   = "{{ db.prefix }}"
 {% endfor %}
+
+[[database.connection.respondd]]
+enable   = {{ yanic_repondd_enable | ternary('true','false') }}
+type     = "udp6"
+address  = "{{ yanic_repondd_remotehost }}"
+
+[[database.connection.logging]]
+enable   = true
+path     = "/var/log/yanic.log"