merge fastd and uplink nodes

1 files changed, 191 insertions, 12 deletions

diff --git a/host_vars/ff-niyawe2 b/host_vars/ff-niyawe2
index c57d17d..99f2c8f 100644
--- a/host_vars/ff-niyawe2
+++ b/host_vars/ff-niyawe2
@@ -1,7 +1,83 @@
 ---
-ansible_host: 2a01:4f8:a0:826b:2::4
+ansible_host: 2a01:4f8:a0:826b:2::2
 #ansible_host: 10.0.2.6
 sites:
+  - name: 'aw'
+    net4: '10.222.88.0/21'
+    net6: '2a03:2260:1016:0202::/64'
+    site_net6: 'fd62:44e1:da:0200::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          64316166303564616561623661653739386434373564646630396361366262303737346632656136
+          3164613138393838616235343936633162333032323563320a666235383763383766373761623533
+          36313135643830623363353966653138346364646639386339393664366565323265366630333362
+          6264633837626133300a373133353532656331623038346637643834613563383435366534393865
+          31343432663535653364643564306533383333303939656232336232306136663839376662656332
+          63396465303038396531653239323264346233313563636261613231343763306130316530386262
+          31316432383834323237386138336434663365643732643732323439313564303337636466393334
+          63613666333161366366
+    fastd_mesh_mac: '02:ff:41:57:00:20'
+    fastd_port1: 10014
+    bat_ipv6: '2a03:2260:1016:0202::1'
+    bat_ipv4: '10.222.88.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.88.0'
+    dhcp_netmask: '255.255.248.0'
+    dhcp_start: '10.222.88.50'
+    dhcp_end: '10.222.95.250'
+    vxlan_id: 11443185
+    wireguard_mesh_number: 2
+    wireguard_mesh_priv_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          63616334663237313761666462326564376439633631633839373434393636366363666139653239
+          3361623733653863613637616439616266393039316332380a373031626239383537316536353862
+          66616563356131333439303665303039393965383939383038646236643063613231616330363938
+          6536333561353564620a353634613666383430656639313231363431313662386138396236313364
+          61653766653462343937396636643132323137636331346132313763313135633263613230366336
+          6461376335353964343564383335346366633438383566653066
+    wireguard_mesh_pub_key: 'm3JXl4RCr9xNeWo9L2GXiGVCpPvRX3maaLUw6qPse1I='
+    wireguard_mesh_port: 10015
+    wireguard_mesh_address: 'fe80::00ff:41ff:fe57:2'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:41:57:00:02'
+  - name: 'coc'
+    net4: '10.222.56.0/21'
+    net6: '2a03:2260:1016:0102::/64'
+    site_net6: 'fd62:44e1:da:0100::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          64346365626531663039636230633430613338336164623065393964313538633839346537356533
+          3363313832333561373134363136333663313864383466360a333533643462336533336433353030
+          64306535326562343964373931306366613365356335386163303062363663383264353566656438
+          3838323261303331380a613366306566623531323162373266663863393563323232626565346163
+          64333835356662643561373062393831303366656138356464326232363235373734663038316336
+          37313164306565643032373938353434393333653531623635663030613861306663373761336233
+          65373565653939663832353565656262306633306461316461343735336431393033316433313164
+          35346363653832386138
+    fastd_mesh_mac: '02:ff:43:4f:43:20'
+    fastd_port1: 10012
+    bat_ipv6: '2a03:2260:1016:0102::1'
+    bat_ipv4: '10.222.56.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.56.0'
+    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
+          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'
   - name: 'ems'
     net4: '10.222.192.0/21'
     net6: '2a03:2260:1016:0501::/64'
@@ -40,6 +116,44 @@ sites:
     wireguard_mesh_address: 'fe80::00ff:45ff:fe4d:5301'
     wireguard_mesh_endpoint: '{{ ansible_host }}'
     wireguard_mesh_mac: '02:ff:45:4d:53:01'
+  - name: 'ko'
+    net4: '10.222.24.0/21'
+    net6: '2a03:2260:1016:0002::/64'
+    site_net6: 'fd62:44e1:da::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          32616565386335373931326566326366306138386431303537386639373339306264613665613936
+          3630343838353631633832393265653666656164623434330a636537666266663835303561393437
+          61666665666162353665386434646439323730393839643464303237383034303066623731386638
+          6461303434383162300a303332333031396233383637653737393933636164653833303333633466
+          39336465616562613838646139303462306131326364356265366564356131343866313164356365
+          61623137653661633062613334633231633438626234303064363063396437666431353839313764
+          37313535646131393963353562353862363933373765316531656531353835653231643031383236
+          39633866633130373430
+    fastd_mesh_mac: '02:ff:4b:4f:00:20'
+    fastd_port1: 10010
+    bat_ipv6: '2a03:2260:1016:0002::1'
+    bat_ipv4: '10.222.24.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.24.0'
+    dhcp_netmask: '255.255.248.0'
+    dhcp_start: '10.222.24.50'
+    dhcp_end: '10.222.31.250'
+    vxlan_id: 10891866
+    wireguard_mesh_number: 2
+    wireguard_mesh_priv_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          63313939383639656138636261363033336636303837303565623733663038646637363261386666
+          3562656362636434653131623133396134646666633338320a303435636432363333376130626265
+          66306336363565303433353731646336353764353333383339303865346334636334343231343266
+          3732316335656636630a623364343866633765653232336363653335613065663639626439656533
+          65313464663534626566613238666237623562383763316331306463643339636138623166623964
+          3438626431373233666532623433313337356530346563323838
+    wireguard_mesh_pub_key: 'Nv+aZ3cD6a9qvsrXipMbVG7kGiXV3e7tb92MTbyXDl4='
+    wireguard_mesh_port: 10011
+    wireguard_mesh_address: 'fe80::00ff:4bff:fe4f:2'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:4b:4f:00:02'
   - name: 'my'
     net4: '10.222.64.0/21'
     net6: '2a03:2260:1016:0301::/64'
@@ -78,6 +192,44 @@ sites:
     wireguard_mesh_address: 'fe80::00ff:4dff:fe59:1'
     wireguard_mesh_endpoint: '{{ ansible_host }}'
     wireguard_mesh_mac: '02:ff:4d:59:00:01'
+  - name: 'sim'
+    net4: '10.222.176.0/21'
+    net6: '2a03:2260:1016:0401::/64'
+    site_net6: 'fd62:44e1:da:0400::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          36623461376163303538353865656462643537646265393461656337383936363634653063363938
+          3735616161636231633238323935313861346163636565620a353132303235636662366231393236
+          30323734313065356132623736633231326537626462366264653138666533633461393830336634
+          6530666637613164340a663133386134393235636362633833373531323132636138623163656638
+          34363637623331666335353464366539623936306437356538393034376232346566323431636231
+          32653236386632656633636438303130323065386635616462666631386361396233303965393332
+          63333233656336313633303166333638663335363035653230316633303233376131396135373462
+          34343163616561343163
+    fastd_mesh_mac: '02:ff:53:49:4d:10'
+    fastd_port1: 10018
+    bat_ipv6: '2a03:2260:1016:0401::1'
+    bat_ipv4: '10.222.176.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.176.0'
+    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
+          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'
 wireguard_bb_name: 'niyawe2'
 wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
@@ -92,14 +244,41 @@ wireguard_bb_pub_key: 'ctSz9JjaPWM4Se39rSsbr39wXWfA1LJDF1OwwBui0VY='
 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
+ffrl_ip4: '185.66.194.57'
+ffrl_peers:
+  - name: 'bbafra2fra'
+    remote: '185.66.194.0'
+    ip4: '100.64.9.155'
+    peer_ip4: '100.64.9.154'
+    ip6: '2a03:2260:0:4e2::2'
+    peer_ip6: '2a03:2260:0:4e2::1'
+  - name: 'bbbfra2fra'
+    remote: '185.66.194.1'
+    ip4: '100.64.9.157'
+    peer_ip4: '100.64.9.156'
+    ip6: '2a03:2260:0:4e3::2'
+    peer_ip6: '2a03:2260:0:4e3::1'
+  - name: 'bbaixdus'
+    remote: '185.66.193.0'
+    ip4: '100.64.9.159'
+    peer_ip4: '100.64.9.158'
+    ip6: '2a03:2260:0:4e4::2'
+    peer_ip6: '2a03:2260:0:4e4::1'
+  - name: 'bbbixdus'
+    remote: '185.66.193.1'
+    ip4: '100.64.9.161'
+    peer_ip4: '100.64.9.160'
+    ip6: '2a03:2260:0:4e5::2'
+    peer_ip6: '2a03:2260:0:4e5::1'
+  - name: 'bbaakber'
+    remote: '185.66.195.0'
+    ip4: '100.64.9.163'
+    peer_ip4: '100.64.9.162'
+    ip6: '2a03:2260:0:4e6::2'
+    peer_ip6: '2a03:2260:0:4e6::1'
+  - name: 'bbbakber'
+    remote: '185.66.195.1'
+    ip4: '100.64.9.165'
+    peer_ip4: '100.64.9.164'
+    ip6: '2a03:2260:0:4e7::2'
+    peer_ip6: '2a03:2260:0:4e7::1'