From 9ec1670a262597356c24bff27d473eccceb45b61 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@niyawe.de>
Date: Wed, 28 Jul 2021 01:12:10 +0200
Subject: wg

---
 host_vars/ff-niyawe3 | 60 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

(limited to 'host_vars/ff-niyawe3')

diff --git a/host_vars/ff-niyawe3 b/host_vars/ff-niyawe3
index 8301103..6fa9d4a 100644
--- a/host_vars/ff-niyawe3
+++ b/host_vars/ff-niyawe3
@@ -17,7 +17,6 @@ sites:
           61303232626638303231
     fastd_mesh_mac: '02:ff:43:4f:43:10'
     fastd_port1: 10012
-    fastd_port2: 10013
     bat_ipv6: '2a03:2260:1016:0101::1'
     bat_ipv4: '10.222.48.1'
     bat_ipv4_cidr: 21
@@ -25,20 +24,21 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.222.48.50'
     dhcp_end: '10.222.55.250'
+    vxlan_id: 10540244
     wireguard_mesh_number: 1
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          65393166666534346265306137336538623436363861653665616334313539643935633538366532
-          3237313434633365353936643261343930346266663032350a356464363739333961636462336138
-          34323637643834333635633366336132373034353865653864343335363139643066383536653362
-          3564393430333862650a333364343162613362633461383063323031343661303139343036623332
-          61656335373662653163393363633366643138383335653639343663613262323837623062373035
-          3431353931643661633362623166643763643039343862326664
-    wireguard_mesh_pub_key: '1l8yIMvXfhtP+pKEB5ivOFDK99VtL++L5Z8hdnScHEg='
-    wireguard_mesh_port: 10051
-    wireguard_mesh_address: 'fdff:434f:43bb::1'
-    wireguard_mesh_endpoint: '2a01:4f8:160:33c1:2::3'
-    wireguard_mesh_mac_prefix: '02:ff:43:4f:43:1'
+          37346162323035633263653630353265333838376165636664363434666263636230383339336535
+          3666316438633539313137666461353133376532386434650a306262643965636431303138326436
+          62306233303134653232663233343134393833643866396466663664656638663864656266386336
+          3630343163393334390a303632663962316365626330613464353263616364366533316566633730
+          32366232336331653366656237323561323939356235323864393463616133373035323763363261
+          3937633731373231316433373866643365316637323134363931
+    wireguard_mesh_pub_key: 'dqyoKKWYSfaov1zc1SpKbtVJPsoCDui5NsFzTCoqkBs='
+    wireguard_mesh_port: 10013
+    wireguard_mesh_address: 'fe80::00ff:43ff:fe4f:4301'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:43:4f:43:01'
   - name: 'ems'
     net4: '10.222.200.0/21'
     net6: '2a03:2260:1016:0502::/64'
@@ -55,7 +55,6 @@ sites:
           33396464306363333965
     fastd_mesh_mac: '02:ff:45:4d:53:20'
     fastd_port1: 10020
-    fastd_port2: 10021
     bat_ipv6: '2a03:2260:1016:0502::1'
     bat_ipv4: '10.222.200.1'
     bat_ipv4_cidr: 21
@@ -63,22 +62,23 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.222.200.50'
     dhcp_end: '10.222.207.250'
+    vxlan_id: 337565
     wireguard_mesh_number: 2
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          65323566376335353033303561663336343266383032343333323564653162333136646130326436
-          3337643031616531346332383639396533623032356332390a393563373133643465613230356561
-          31393461396531373436316639653138306337633831376164373434616262323830396532353937
-          6230333938303038340a383664373762316363626664636639363736343836376637366362346231
-          39343462316361653932306438313537396536663830626137656565373363663161343463326637
-          3035626464626263316634373161396135363261336236613063
-    wireguard_mesh_pub_key: '2RULJYV2+K8ZCmab91dqeCBDGSEJkJ5lPC3iJg0w3R8='
-    wireguard_mesh_port: 10055
-    wireguard_mesh_address: 'fdff:454d:53bb::2'
-    wireguard_mesh_endpoint: '2a01:4f8:160:33c1:2::3'
-    wireguard_mesh_mac_prefix: '02:ff:45:4d:53:2'
+          64643165393762323161656536383934313365353664373636663937353531383333326164623434
+          3063356664313437353465346430303233303233343965320a373733326437616163616464356436
+          36323839353437656539383937333032353233316639363130666238303238623565363664613735
+          3037313661383930640a346235346661353435633362373861633134396466376631336637663534
+          34623365386161333230616339326665623535366333373436616633623634636139653766643165
+          3334653163353965383235356266623566666136663832396461
+    wireguard_mesh_pub_key: 'bOg54QrGq1DjyVQ13DKNkRYXKSy2bwhy3UM+HfCJPE8='
+    wireguard_mesh_port: 10021
+    wireguard_mesh_address: 'fe80::00ff:45ff:fe4d:5302'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:45:4d:53:02'
 wireguard_bb_name: 'niyawe3'
-wireguard_bb_endpoint: '2a01:4f8:160:33c1:2::3'
+wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           36646461356165306461613362613937343861353538646234656230313937386263663435366432
@@ -92,3 +92,13 @@ wireguard_bb_ipv4: '10.222.0.13'
 wireguard_bb_ipv6: 'fe80::ffbb:ffbb:13'
 wireguard_bb_port: 10113
 preferred_uplink: 'uplink1'
+wgkex_host: 'vpn.freifunk-myk.de'
+wgkex_port: 18883
+wgkex_username: ff-niyawe3
+wgkex_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          62363231646533343134353534343233626435633966303235666436613634396663633137616566
+          6339333737616234633435373634613235303464346131370a353564623762306133363534393864
+          30323935373061386137316435313931616662336539396136613935623562303662613237376538
+          3865643262306433380a656339303865376530353862336532313466393132396239626531303665
+          30646361336632316334396432303330633837373237353836393166373965613762
-- 
cgit v1.2.3-54-g00ecf