wg

1 files changed, 39 insertions, 29 deletions

diff --git a/host_vars/ff-niyawe4 b/host_vars/ff-niyawe4
index 641243b..427cb93 100644
--- a/host_vars/ff-niyawe4
+++ b/host_vars/ff-niyawe4
@@ -17,7 +17,6 @@ sites:
           63613861373562663734
     fastd_mesh_mac: '02:ff:57:57:00:10'
     fastd_port1: 10022
-    fastd_port2: 10023
     bat_ipv6: '2a03:2260:1016:0701::1'
     bat_ipv4: '10.30.16.1'
     bat_ipv4_cidr: 21
@@ -25,6 +24,7 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.30.16.50'
     dhcp_end: '10.30.23.250'
+    vxlan_id: 1234
     wireguard_mesh_number: 1
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
@@ -35,10 +35,10 @@ sites:
           32663837656534656163353539363539333266633239636662663061626337393232326235313731
           6636626434626435646462663762613138366336316465656532
     wireguard_mesh_pub_key: 'Uv5i4M/lo/abi9b7gsNbc+PE+bEhpz3jQR8jFfQY7mU='
-    wireguard_mesh_port: 10057
+    wireguard_mesh_port: 10023
     wireguard_mesh_address: 'fdff:5757:bb::1'
-    wireguard_mesh_endpoint: '2a01:4f8:a0:9395:2::4'
-    wireguard_mesh_mac_prefix: '02:ff:57:57:00:1'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:57:57:00:01'
   - name: 'sim'
     net4: '10.222.176.0/21'
     net6: '2a03:2260:1016:0401::/64'
@@ -55,7 +55,6 @@ sites:
           34343163616561343163
     fastd_mesh_mac: '02:ff:53:49:4d:10'
     fastd_port1: 10018
-    fastd_port2: 10019
     bat_ipv6: '2a03:2260:1016:0401::1'
     bat_ipv4: '10.222.176.1'
     bat_ipv4_cidr: 21
@@ -63,20 +62,21 @@ sites:
     dhcp_netmask: '255.255.240.0'
     dhcp_start: '10.222.176.50'
     dhcp_end: '10.222.183.250'
+    vxlan_id: 10908477
     wireguard_mesh_number: 1
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          30613965636361353637353963636263363931616566643364326162323765616266633033336538
-          3038653965303234356665646166623766616163353764300a303033323935376261303161366133
-          66306431323365626366383265303438643964343232383939616134303239633333363638333137
-          3936663331336261620a346263663935643962326663356639613531323735636164396461393936
-          66386466333833393635666431326664383830343765323438613364656631383338373163376537
-          6630303832313539383664366338383333633163633139366338
-    wireguard_mesh_pub_key: 'leFz1AeyMu884CRWkET9epW3jGksyopaANNiskvAkmc='
-    wireguard_mesh_port: 10054
-    wireguard_mesh_address: 'fdff:5349:4dbb::1'
-    wireguard_mesh_endpoint: '2a01:4f8:a0:9395:2::4'
-    wireguard_mesh_mac_prefix: '02:ff:53:49:4d:1'
+          61663530636333343161656664313464306533343934306335653137303463663663386663366463
+          6538396238616663336633326564386663343531653831650a633230653464636337653431663238
+          61363635616139643237626462306530313636383962653533626637666162643263323566373439
+          6632366462303033370a396638303765323939343335383165643739313738366363396566376337
+          65333237343631613636303639636231363331393262353566623564306330353038343562663464
+          6335616665613065393164383332633162306137396133343030
+    wireguard_mesh_pub_key: '3587KYreUmBTyARprP+gRKlM7Uo6HH1JJYR5v9JcMkE='
+    wireguard_mesh_port: 10019
+    wireguard_mesh_address: 'fe80::00ff:53ff:fe49:4d01'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:53:49:4d:01'
   - name: 'coc'
     net4: '10.222.56.0/21'
     net6: '2a03:2260:1016:0102::/64'
@@ -93,7 +93,6 @@ sites:
           35346363653832386138
     fastd_mesh_mac: '02:ff:43:4f:43:20'
     fastd_port1: 10012
-    fastd_port2: 10013
     bat_ipv6: '2a03:2260:1016:0102::1'
     bat_ipv4: '10.222.56.1'
     bat_ipv4_cidr: 21
@@ -101,22 +100,23 @@ sites:
     dhcp_netmask: '255.255.248.0'
     dhcp_start: '10.222.56.50'
     dhcp_end: '10.222.63.250'
+    vxlan_id: 10540244
     wireguard_mesh_number: 2
     wireguard_mesh_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          30616336326166366137353934323334356336353933643561333432303134303766313664666265
-          3834626539666264366566343161636234313036613337340a663937353336333938656362373631
-          36633136386165636362643764306432353632626330386464316639646435323032313262313363
-          3861353234373533310a323166666232613861616637386262356266316336323263656336663366
-          35616566656538373633326531323766303532613861623765653839353933383732613761333230
-          6461633533373466346138656462346532303430653465306334
-    wireguard_mesh_pub_key: 'gQH/0cJAwFzmUyoqQ/zkQt5Ez3r+UL+ZSbWcovJMCCw='
-    wireguard_mesh_port: 10051
-    wireguard_mesh_address: 'fdff:434f:43bb::2'
-    wireguard_mesh_endpoint: '2a01:4f8:a0:9395:2::4'
-    wireguard_mesh_mac_prefix: '02:ff:43:4f:43:2'
+          36326163616362316539366532373738393861343162346362346165323431306133663066616632
+          3333633636643530393030353930396165343134313531620a346361656539383935653061643633
+          36613038613336313137656264663661646233396333396563643664346339356530666231633130
+          6662326532323239300a653662653264636462353961383437623637636161363430643935326439
+          37366265376637653531613537346663343364626332343931613462666366643231356335626631
+          6238633631656139383733333739373733356430343132353330
+    wireguard_mesh_pub_key: 'qshyUBm3WTO0u+InjrJ5+oTv9xVzRGoOIuZOlC5/e2A='
+    wireguard_mesh_port: 10013
+    wireguard_mesh_address: 'fe80::00ff:43ff:fe4f:4302'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:43:4f:43:02'
 wireguard_bb_name: 'niyawe4'
-wireguard_bb_endpoint: '2a01:4f8:a0:9395:2::4'
+wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           38383133393039323737656234336237336566363034316339373835336665356332363635353261
@@ -130,3 +130,13 @@ wireguard_bb_ipv4: '10.222.0.17'
 wireguard_bb_ipv6: 'fe80::ffbb:ffbb:17'
 wireguard_bb_port: 10117
 preferred_uplink: 'uplink2'
+wgkex_host: 'vpn.freifunk-myk.de'
+wgkex_port: 18883
+wgkex_username: ff-niyawe4
+wgkex_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          62323766636136336331366539613065353562633734343362313330663637666636643132323564
+          3039663063666264343665363030666230336230663637380a303432356537326436383665333533
+          65363333323330373031363065666432303338303736373061383361396638663165383531643537
+          6461373638343637640a646164353261326265663733633636313161346638313134616234633361
+          65663365376233643562616132636565376334366336393836623335633530623037