merge fastd and uplink nodes

1 files changed, 229 insertions, 12 deletions

diff --git a/host_vars/ff-niyawe1 b/host_vars/ff-niyawe1
index 30ea966..c3d4942 100644
--- a/host_vars/ff-niyawe1
+++ b/host_vars/ff-niyawe1
@@ -1,7 +1,121 @@
 ---
-ansible_host: 2a01:4f8:151:13cd:2::3
+ansible_host: 2a01:4f8:272:3d5f:2::2
 #ansible_host: 10.0.1.6
 sites:
+  - name: 'aw'
+    net4: '10.222.80.0/21'
+    net6: '2a03:2260:1016:0201::/64'
+    site_net6: 'fd62:44e1:da:0200::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          66613864623830333561306634656664623831613235336463353433393835623633313531636164
+          3132343936323530316438366530343336393366343735390a643862663163366661383963366461
+          63356536333162306635653863386430306463323963633066626336663837633762356632393163
+          3661353338313935330a303338343231393965333534633438396261633431613734646265373830
+          30623665633364343639646539616262666663333830396363336436343938613266333963363432
+          65303930366339626331356230316236396138653735666431633437313436303862363437313738
+          38626439626562386264623534646238666436656362633432666137666334643366303733396132
+          35396461636664396633
+    fastd_mesh_mac: '02:ff:41:57:00:10'
+    fastd_port1: 10014
+    bat_ipv6: '2a03:2260:1016:0201::1'
+    bat_ipv4: '10.222.80.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.80.0'
+    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
+          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: 'coc'
+    net4: '10.222.48.0/21'
+    net6: '2a03:2260:1016:0101::/64'
+    site_net6: 'fd62:44e1:da:0100::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          36343336633735316533356365663562633136316164346335613665343736643538613033323837
+          3163666137323238323535623663393466343061393432640a363838366533663135366665343137
+          64393938336636336230306333376365646631393432333934326631366666363266633631366636
+          3232396339613063360a356636623235333161633630363361653064626232386132393065363961
+          64653535613861636633303164353964393461376432646539656332373461626139333166343163
+          65376133646361616539303338373164623933633061663635353338643036396332656332643738
+          61626236323463623362613335653436643631356362343866333035623662336262323166616163
+          61303232626638303231
+    fastd_mesh_mac: '02:ff:43:4f:43:10'
+    fastd_port1: 10012
+    bat_ipv6: '2a03:2260:1016:0101::1'
+    bat_ipv4: '10.222.48.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.48.0'
+    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
+          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'
+    site_net6: 'fd62:44e1:da:0500::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          39643432623937346662666565393066356635346236313562376339373665653837376365326531
+          3366643661613065303837353830666566356266613036650a383531336266363036366664323439
+          64636330346166306464353564363266303836666134373739646566306337333666356231616364
+          3635616561323332340a323665353031653566646562393430666261363834353036663938636634
+          62363261663531383464646262306237353233346535623235643561633435623939646262313561
+          30656531313664326663666661636465303239353331356633353238363433336561316264613037
+          33636239303465623333316561653732653638633632343165383934313738303365633937373038
+          33396464306363333965
+    fastd_mesh_mac: '02:ff:45:4d:53:20'
+    fastd_port1: 10020
+    bat_ipv6: '2a03:2260:1016:0502::1'
+    bat_ipv4: '10.222.200.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.200.0'
+    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
+          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'
   - name: 'ko'
     net4: '10.222.16.0/21'
     net6: '2a03:2260:1016:0001::/64'
@@ -40,6 +154,82 @@ sites:
     wireguard_mesh_address: 'fe80::00ff:4bff:fe4f:1'
     wireguard_mesh_endpoint: '{{ ansible_host }}'
     wireguard_mesh_mac: '02:ff:4b:4f:00:01'
+  - name: 'my'
+    net4: '10.222.72.0/21'
+    net6: '2a03:2260:1016:0302::/64'
+    site_net6: 'fd62:44e1:da:300::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          36356665356465363064623732316337393137633133383133666330353238636432643232383534
+          3136386561663630633461653132626531666336663962650a363164343264623664316465663264
+          39336561346634623530636464646261313362383533363336383138663435346265626563646461
+          3231313735313266610a373663363966303961363039346137353132353864326639343732613032
+          33626665646364643036633662316234366666303364373434656137666233613030386562643662
+          37663232306135643461376435653263333834366163663634646164326236643730356135386464
+          31303439643035643732306162666261393735333334323433306633313635373363636364306663
+          36396363306537636164
+    fastd_mesh_mac: '02:ff:4d:59:00:20'
+    fastd_port1: 10016
+    bat_ipv6: '2a03:2260:1016:0302::1'
+    bat_ipv4: '10.222.72.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.72.0'
+    dhcp_netmask: '255.255.248.0'
+    dhcp_start: '10.222.72.50'
+    dhcp_end: '10.222.79.250'
+    vxlan_id: 6118532
+    wireguard_mesh_number: 2
+    wireguard_mesh_priv_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          30353832633365613063633862383665666263393331323435393138643030393231643438353366
+          3039393736333564666530346630346130653138316436370a613763333334663731326363653863
+          39653139326462636531376136306666313537336265636334393831633035613337383464383838
+          3564356534323262370a393434353238383535363135393734636261633533323462623932366436
+          64613834363539303233356262373630373264623337356131623939646365653061663831343262
+          6464393331633661356232323338653137333635396137373636
+    wireguard_mesh_pub_key: 'pwwP7VxQsVyi/GUSLvyenhHgf71SNKaGwItThTWGHDg='
+    wireguard_mesh_port: 10017
+    wireguard_mesh_address: 'fe80::00ff:4dff:fe59:2'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:4d:59:00:02'
+  - name: 'sim'
+    net4: '10.222.184.0/21'
+    net6: '2a03:2260:1016:0402::/64'
+    site_net6: 'fd62:44e1:da:0400::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          39303135363836313137613238633137646235366637393463346132366361363465303531653565
+          3439336633396532303563613536333264373863663933650a653566626462346133363433333337
+          64333138353862613937653065613136323238666336363635643062643538363265323335643766
+          6465393863393630640a643531376464336334346530393764376139623033336139616138653534
+          64616531313665336365323331616263613336313938316663383437353532316631636138663661
+          37666538656533346365393435316630323065316336303138373962393038653831623339656634
+          37343837373965393866653965366335636563303931333465656539316563646162626261633535
+          34303934616666633764
+    fastd_mesh_mac: '02:ff:53:49:4d:20'
+    fastd_port1: 10018
+    bat_ipv6: '2a03:2260:1016:0402::1'
+    bat_ipv4: '10.222.184.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.184.0'
+    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
+          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: 'niyawe1'
 wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
@@ -54,14 +244,41 @@ wireguard_bb_pub_key: 'zGubrJd9Wfa1Yo9I5xyJArdvX1bj7OS2VFth289PdlU='
 wireguard_bb_ipv4: '10.222.0.11'
 wireguard_bb_ipv6: 'fe80::ffbb:ffbb:11'
 wireguard_bb_port: 10111
-preferred_uplink: 'uplink1'
-wgkex_host: 'vpn.freifunk-myk.de'
-wgkex_port: 18883
-wgkex_username: niyawe1
-wgkex_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          36663866376238393738383262353531363531653134383962346166643661626361626431373334
-          3062653736326232646239653733303165666433653864370a363031396136313335366239633665
-          64656434323338346666393334656535616237313639316536303431343036653335626231633933
-          3730643362666330630a616333613961636534306235313365353064383337343366353735663639
-          34336138333864373262396434356265373162356161666235666436366562666264
+ffrl_ip4: '185.66.194.56'
+ffrl_peers:
+  - name: 'bbaakber'
+    remote: '185.66.195.0'
+    ip4: '100.64.9.99'
+    peer_ip4: '100.64.9.98'
+    ip6: '2a03:2260:0:4c6::2'
+    peer_ip6: '2a03:2260:0:4c6::1'
+  - name: 'bbafra2fra'
+    remote: '185.66.194.0'
+    ip4: '100.64.9.101'
+    peer_ip4: '100.64.9.100'
+    ip6: '2a03:2260:0:4c7::2'
+    peer_ip6: '2a03:2260:0:4c7::1'
+  - name: 'bbaixdus'
+    remote: '185.66.193.0'
+    ip4: '100.64.9.103'
+    peer_ip4: '100.64.9.102'
+    ip6: '2a03:2260:0:4c8::2'
+    peer_ip6: '2a03:2260:0:4c8::1'
+  - name: 'bbbakber'
+    remote: '185.66.195.1'
+    ip4: '100.64.9.105'
+    peer_ip4: '100.64.9.104'
+    ip6: '2a03:2260:0:4c9::2'
+    peer_ip6: '2a03:2260:0:4c9::1'
+  - name: 'bbbfra2fra'
+    remote: '185.66.194.1'
+    ip4: '100.64.9.107'
+    peer_ip4: '100.64.9.106'
+    ip6: '2a03:2260:0:4ca::2'
+    peer_ip6: '2a03:2260:0:4ca::1'
+  - name: 'bbbixdus'
+    remote: '185.66.193.1'
+    ip4: '100.64.9.109'
+    peer_ip4: '100.64.9.108'
+    ip6: '2a03:2260:0:4cb::2'
+    peer_ip6: '2a03:2260:0:4cb::1'