wg

1 files changed, 35 insertions, 25 deletions

diff --git a/host_vars/ff-niyawe2 b/host_vars/ff-niyawe2
index 25553a7..c57d17d 100644
--- a/host_vars/ff-niyawe2
+++ b/host_vars/ff-niyawe2
@@ -18,7 +18,6 @@ sites:
           63646437393532356338
     fastd_mesh_mac: '02:ff:45:4d:53:10'
     fastd_port1: 10020
-    fastd_port2: 10021
     bat_ipv6: '2a03:2260:1016:0501::1'
     bat_ipv4: '10.222.192.1'
     bat_ipv4_cidr: 21
@@ -26,20 +25,21 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.222.192.50'
     dhcp_end: '10.222.199.250'
+    vxlan_id: 337565
     wireguard_mesh_number: 1
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          63623465313439373532643831653635646236616234373836353866656566363561323863373839
-          3338303064653766633231633361656535666134343261650a626362346535313561376238623837
-          39393238386266626663323830333664396331343431626436363533356633396565656437353262
-          6461633864323038380a306336663536633231346533313936303765663736313933323964336232
-          32653462343239373734623330303766333261383837353963623766363138626634656165343033
-          3532373331656561613832613134613965336532663839363266
-    wireguard_mesh_pub_key: 'SOXPYthzuHKPDTWJRJ391jmL4aOXKVif+La4zXYSbR0='
-    wireguard_mesh_port: 10055
-    wireguard_mesh_address: 'fdff:454d:53bb::1'
-    wireguard_mesh_endpoint: '2a01:4f8:a0:826b:2::4'
-    wireguard_mesh_mac_prefix: '02:ff:45:4d:53:1'
+          32383031666464633861313732653264663463383036366539366431383066323438663738613265
+          6339636531646365336462353065633937373836323431610a343432616361646334636338306331
+          38663662373334653931656633373064613866336231613463303261646261323831623339616537
+          3933663036616664390a373965633838353535386239343864633435646566393334373637636561
+          38663566373433356165616535343366623562623464653034653963653235643935346632643533
+          6665633237376664613030373236396663383461366433303631
+    wireguard_mesh_pub_key: '97Ih/Gvgwj6W3Dcf0iMFm+DtLlkNEiSwIEwnUwlmMUI='
+    wireguard_mesh_port: 10021
+    wireguard_mesh_address: 'fe80::00ff:45ff:fe4d:5301'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:45:4d:53:01'
   - name: 'my'
     net4: '10.222.64.0/21'
     net6: '2a03:2260:1016:0301::/64'
@@ -56,7 +56,6 @@ sites:
           36303333346530376134
     fastd_mesh_mac: '02:ff:4d:59:00:10'
     fastd_port1: 10016
-    fastd_port2: 10017
     bat_ipv6: '2a03:2260:1016:0301::1'
     bat_ipv4: '10.222.64.1'
     bat_ipv4_cidr: 21
@@ -64,22 +63,23 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.222.64.50'
     dhcp_end: '10.222.71.250'
+    vxlan_id: 6118532
     wireguard_mesh_number: 1
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          30373738613931353235333135323137626661663530656237343031653938653763373937333339
-          6131386232633866633038643230393433653764633830380a333532323531653863333163373463
-          62356638366134336134633333393630313763353262393564613038646266393733343831333439
-          6635373035343836340a663530383865653037396530613434376637633136353163366239633266
-          37646337366630653632623432323162383965666330316337383962363761323162303534303032
-          3561326432633130653332306236643637343736646163333732
-    wireguard_mesh_pub_key: 'savF0Td3FRi8HcffTG+Hv/k/djVcbzGkQhTNYTAMtRg='
-    wireguard_mesh_port: 10053
-    wireguard_mesh_address: 'fdff:4d59:bb::1'
-    wireguard_mesh_endpoint: '2a01:4f8:a0:826b:2::4'
-    wireguard_mesh_mac_prefix: '02:ff:4d:59:00:1'
+          63656233363539313336616565373830326235316135656535326364386339323762663433336266
+          6133336162323639663332343466666263653462376533620a623731663765646462663438653762
+          39376330613036353638356462376165393630393034343265383334616331643632323235376661
+          3632613063343461340a613637366461663134323738313566386432313233613862376335393732
+          61616262613936396661623735343131613835643431663935386134643062626430306430346130
+          6339373236313865653265636463373236316333646565313939
+    wireguard_mesh_pub_key: '+7I9fQugmzYpTssYZwQaLGwC2PfIElHyPY2iPZ7+NEs='
+    wireguard_mesh_port: 10017
+    wireguard_mesh_address: 'fe80::00ff:4dff:fe59:1'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:4d:59:00:01'
 wireguard_bb_name: 'niyawe2'
-wireguard_bb_endpoint: '2a01:4f8:a0:826b:2::4'
+wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           35363033353438343934353931643434386239316435326139643133366438646261643261653430
@@ -93,3 +93,13 @@ wireguard_bb_ipv4: '10.222.0.12'
 wireguard_bb_ipv6: 'fe80::ffbb:ffbb:12'
 wireguard_bb_port: 10112
 preferred_uplink: 'uplink2'
+wgkex_host: 'vpn.freifunk-myk.de'
+wgkex_port: 18883
+wgkex_username: ff-niyawe2
+wgkex_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          65656636353639633062316439333865636537373337646162613265333537653037643264363366
+          3565336561613065303661666335383465346364356365320a353037353034666338646138646631
+          61356138343238323464393238646261363965363034373138333832323762633433376139376265
+          3930346161666561380a333433333064386364363735666535386165353466303964393362656431
+          31373135666239633437363030666533646262353565636638616632303735313666