wg

1 files changed, 35 insertions, 25 deletions

diff --git a/host_vars/ff-loppermann1 b/host_vars/ff-loppermann1
index ccf98ac..ebb00a8 100644
--- a/host_vars/ff-loppermann1
+++ b/host_vars/ff-loppermann1
@@ -17,7 +17,6 @@ sites:
           35396461636664396633
     fastd_mesh_mac: '02:ff:41:57:00:10'
     fastd_port1: 10014
-    fastd_port2: 10015
     bat_ipv6: '2a03:2260:1016:0201::1'
     bat_ipv4: '10.222.80.1'
     bat_ipv4_cidr: 21
@@ -25,20 +24,21 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.222.80.50'
     dhcp_end: '10.222.87.250'
+    vxlan_id: 11443185
     wireguard_mesh_number: 1
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          63383761663434323865396664393839333861303233393666396462363662633238613963656164
-          3066633135353637356331393639353366393061373564320a343462396239636565366364643236
-          37643666333939626136316563363332323638323462373133656531643439363336326561623064
-          3735343534363736380a333238306136323465366662333861316237646334643332633566366634
-          62616135303462313262626335626331396366653238343637383931323563336162393334396437
-          3639383962636464636233353933613730366262666533626431
-    wireguard_mesh_pub_key: '65M3xfawqfiCB6OZ2boH4rxZyC2jZnG5yqerurbVV10='
-    wireguard_mesh_port: 10052
-    wireguard_mesh_address: 'fdff:4157:bb::1'
-    wireguard_mesh_endpoint: '2a01:4f8:140:1242:ff::2'
-    wireguard_mesh_mac_prefix: '02:ff:41:57:00:1'
+          35303461376637356232386239353362353333383966613030646361313338663839646666306237
+          3433636237396630623830303938663735376337666337640a346635616337306235376434643265
+          66396465393962326635313966653533313638646361383638373836313063346361343364306636
+          3033393631306137630a333763386666623835623635633839616165616362633836626135323530
+          35393363646161333062396139626563383334383262333066636663663634353635626334383935
+          3437616563363566613736623361633934643962643662366338
+    wireguard_mesh_pub_key: 'tf/eNi+WOlsoXTmtAvQEwRv64YME0SIE+rlQysLd/Dc='
+    wireguard_mesh_port: 10015
+    wireguard_mesh_address: 'fe80::00ff:41ff:fe57:1'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:41:57:00:01'
   - name: 'sim'
     net4: '10.222.184.0/21'
     net6: '2a03:2260:1016:0402::/64'
@@ -55,7 +55,6 @@ sites:
           34303934616666633764
     fastd_mesh_mac: '02:ff:53:49:4d:20'
     fastd_port1: 10018
-    fastd_port2: 10019
     bat_ipv6: '2a03:2260:1016:0402::1'
     bat_ipv4: '10.222.184.1'
     bat_ipv4_cidr: 21
@@ -63,22 +62,23 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.222.184.50'
     dhcp_end: '10.222.191.250'
+    vxlan_id: 10908477
     wireguard_mesh_number: 2
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          61356134643033316531313738343064633137373632356130336564636463396232326538363932
-          3262343039376663306662306235666163633337396564630a613263353762326532393434373664
-          32366461356635353563313335353761376137363638616137356261333236306461383638336262
-          6333626663646665660a313230326661663466323764323163623236663363356366363330303865
-          39383134396137343638376438376531343662353761336361303166313537346231333563393838
-          3563613064366234373639626134333862323832636461653931
-    wireguard_mesh_pub_key: 'wi+IyKglGh9fZ+C4sGHa5RYCN334dryHROuDx5p2AxE='
-    wireguard_mesh_port: 10054
-    wireguard_mesh_address: 'fdff:5349:4dbb::2'
-    wireguard_mesh_endpoint: '2a01:4f8:140:1242:ff::2'
-    wireguard_mesh_mac_prefix: '02:ff:53:49:4d:2'
+          31343338643330396338336365636336363537633939396265336639666464643563353362613863
+          3234616436313331303433613837663033653437323839340a663838646136323265653861636539
+          63373462646430376265356533363932393861626133356536306237373730303132313366306538
+          3034653565386462640a666361653236373562653464643562636232303965663437376535646363
+          63333662333630383162326166323239333966323537303238353164373939343735366230313031
+          3731663830326363323062363637663730313736383139353732
+    wireguard_mesh_pub_key: 'hDx+zhY9WgabV3Sgp7fsfRRqNIzOP5z0Tl2t7wZjzBw='
+    wireguard_mesh_port: 10019
+    wireguard_mesh_address: 'fe80::00ff:53ff:fe49:4d02'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:53:49:4d:02'
 wireguard_bb_name: 'loppermann1'
-wireguard_bb_endpoint: '2a01:4f8:140:1242:ff::2'
+wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           34613832343432386134316533323739613464396461396463303535393937353233363534346362
@@ -92,3 +92,13 @@ wireguard_bb_ipv4: '10.222.0.16'
 wireguard_bb_ipv6: 'fe80::ffbb:ffbb:16'
 wireguard_bb_port: 10116
 preferred_uplink: 'uplink1'
+wgkex_host: 'vpn.freifunk-myk.de'
+wgkex_port: 18883
+wgkex_username: ff-loppermann1
+wgkex_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          34346166646261616633633164303864613233366165653866636437386164316335376639623066
+          3935323336386461373463353964633562636631643134340a643463373766383864376636663438
+          62336333386162663236613165393162316262333362633438623239633933643830663964373161
+          3365666263623435350a363661656362643738653662316539316535373064393933633637386638
+          63336462333631343838343634343162336436313262336432313233393235393765