aw1, sim2 ff-niyawe1 -> ff-loppermann1

ems1, my1 ff-niyawe2 -> ff-uniko1
ko2 ff-niyawe2 -> ff-niyawe1
7 changed files with 203 additions and 215 deletions
--- a/host_vars/ff-loppermann1
+++ b/host_vars/ff-loppermann1
@ -1,6 +1,44 @@
 ---
 ansible_host: 2a01:4f8:140:1242:ff::2
 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'
@ -39,6 +77,44 @@ sites:
    wireguard_mesh_address: 'fe80::00ff:43ff:fe4f:4301'
    wireguard_mesh_endpoint: '{{ ansible_host }}'
    wireguard_mesh_mac: '02:ff:43:4f:43:01'
+  - 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: 'loppermann1'
 wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
@ -70,37 +146,37 @@ ffrl_ip4: '185.66.194.105'
 ffrl_peers:
  - name: 'bbaakber'
    remote: '185.66.195.0'
-    ip4: '100.64.10.232'
-    peer_ip4: '100.64.10.233'
+    ip4: '100.64.10.233'
+    peer_ip4: '100.64.10.232'
    ip6: '2a03:2260:0:58b::2'
    peer_ip6: '2a03:2260:0:58b::1'
  - name: 'bbafra2fra'
    remote: '185.66.194.0'
-    ip4: '100.64.10.234'
-    peer_ip4: '100.64.10.235'
+    ip4: '100.64.10.235'
+    peer_ip4: '100.64.10.234'
    ip6: '2a03:2260:0:58c::2'
    peer_ip6: '2a03:2260:0:58c::1'
  - name: 'bbaixdus'
    remote: '185.66.193.0'
-    ip4: '100.64.10.236'
-    peer_ip4: '100.64.10.237'
+    ip4: '100.64.10.237'
+    peer_ip4: '100.64.10.236'
    ip6: '2a03:2260:0:58d::2'
    peer_ip6: '2a03:2260:0:58d::1'
  - name: 'bbbakber'
    remote: '185.66.195.1'
-    ip4: '100.64.10.238'
-    peer_ip4: '100.64.10.239'
+    ip4: '100.64.10.239'
+    peer_ip4: '100.64.10.238'
    ip6: '2a03:2260:0:58e::2'
    peer_ip6: '2a03:2260:0:58e::1'
  - name: 'bbbfra2fra'
    remote: '185.66.194.1'
-    ip4: '100.64.10.240'
-    peer_ip4: '100.64.10.241'
+    ip4: '100.64.10.241'
+    peer_ip4: '100.64.10.240'
    ip6: '2a03:2260:0:58f::2'
    peer_ip6: '2a03:2260:0:58f::1'
  - name: 'bbbixdus'
    remote: '185.66.193.1'
-    ip4: '100.64.10.242'
-    peer_ip4: '100.64.10.243'
+    ip4: '100.64.10.243'
+    peer_ip4: '100.64.10.242'
    ip6: '2a03:2260:0:590::2'
    peer_ip6: '2a03:2260:0:590::1'
--- a/host_vars/ff-niyawe1
+++ b/host_vars/ff-niyawe1
@ -2,44 +2,6 @@
 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: 'ems'
    net4: '10.222.200.0/21'
    net6: '2a03:2260:1016:0502::/64'
@ -78,6 +40,44 @@ sites:
    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.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.72.0/21'
    net6: '2a03:2260:1016:0302::/64'
@ -116,44 +116,6 @@ sites:
    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 |
--- a/host_vars/ff-niyawe2
+++ b/host_vars/ff-niyawe2
@ -78,120 +78,6 @@ sites:
    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'
-    site_net6: 'fd62:44e1:da:0500::/64'
-    fastd_secret: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          64366430303532336538633661343838386537316364613866623134663866643634633436316565
-          3764303032353633336662613430663961646535353262310a613238643666313033343438666235
-          36316438366137333430663235303237666132306362616366356439306162633430326366663862
-          6633353266376537640a623163646437396564666232316530616264346566633032393033616438
-          31313538363462633865376234363262653861656234333661613139383538643963646436396464
-          65613834396464613266383936326539623461646661666464623337343834326533303039623665
-          37386130306432313766306638343561653232656238313734396562653661376131653036353264
-          63646437393532356338
-    fastd_mesh_mac: '02:ff:45:4d:53:10'
-    fastd_port1: 10020
-    bat_ipv6: '2a03:2260:1016:0501::1'
-    bat_ipv4: '10.222.192.1'
-    bat_ipv4_cidr: 21
-    dhcp_subnet: '10.222.192.0'
-    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
-          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: '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'
-    site_net6: 'fd62:44e1:da:300::/64'
-    fastd_secret: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          38333436396361633136336561633864383663666439613335613534336339373366396231646333
-          6264303364616131313966306438333135353564366134330a353438343861666337646633383534
-          31366233346663316434316439346639666639653433323363366161313362376262646663396330
-          6362356563616535640a633130623433316165313238346165376337326364306262643139376130
-          39326531633631656665346239386133363833623263663162356161333562636437633333643338
-          32623535323934306164653535633463626234623935653262633739383137326461623731623536
-          30366431633431363164633833323466616637633135636538656332356434333564386165643736
-          36303333346530376134
-    fastd_mesh_mac: '02:ff:4d:59:00:10'
-    fastd_port1: 10016
-    bat_ipv6: '2a03:2260:1016:0301::1'
-    bat_ipv4: '10.222.64.1'
-    bat_ipv4_cidr: 21
-    dhcp_subnet: '10.222.64.0'
-    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
-          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'
  - name: 'sim'
    net4: '10.222.176.0/21'
    net6: '2a03:2260:1016:0401::/64'
--- a/host_vars/ff-uniko1
+++ b/host_vars/ff-uniko1
@ -1,6 +1,44 @@
 ---
 ansible_host: 2001:4c80:50:14::c04
 sites:
+  - name: 'ems'
+    net4: '10.222.192.0/21'
+    net6: '2a03:2260:1016:0501::/64'
+    site_net6: 'fd62:44e1:da:0500::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          64366430303532336538633661343838386537316364613866623134663866643634633436316565
+          3764303032353633336662613430663961646535353262310a613238643666313033343438666235
+          36316438366137333430663235303237666132306362616366356439306162633430326366663862
+          6633353266376537640a623163646437396564666232316530616264346566633032393033616438
+          31313538363462633865376234363262653861656234333661613139383538643963646436396464
+          65613834396464613266383936326539623461646661666464623337343834326533303039623665
+          37386130306432313766306638343561653232656238313734396562653661376131653036353264
+          63646437393532356338
+    fastd_mesh_mac: '02:ff:45:4d:53:10'
+    fastd_port1: 10020
+    bat_ipv6: '2a03:2260:1016:0501::1'
+    bat_ipv4: '10.222.192.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.192.0'
+    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
+          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: 'ko'
    net4: '10.222.16.0/21'
    net6: '2a03:2260:1016:0001::/64'
@ -39,6 +77,44 @@ 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.64.0/21'
+    net6: '2a03:2260:1016:0301::/64'
+    site_net6: 'fd62:44e1:da:300::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          38333436396361633136336561633864383663666439613335613534336339373366396231646333
+          6264303364616131313966306438333135353564366134330a353438343861666337646633383534
+          31366233346663316434316439346639666639653433323363366161313362376262646663396330
+          6362356563616535640a633130623433316165313238346165376337326364306262643139376130
+          39326531633631656665346239386133363833623263663162356161333562636437633333643338
+          32623535323934306164653535633463626234623935653262633739383137326461623731623536
+          30366431633431363164633833323466616637633135636538656332356434333564386165643736
+          36303333346530376134
+    fastd_mesh_mac: '02:ff:4d:59:00:10'
+    fastd_port1: 10016
+    bat_ipv6: '2a03:2260:1016:0301::1'
+    bat_ipv4: '10.222.64.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.64.0'
+    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
+          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: 'uniko1'
 wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
--- a/roles/install_haveged/tasks/main.yml
+++ b/roles/install_haveged/tasks/main.yml
@ -1,12 +0,0 @@
---
- name: install haveged
-  pacman:
-      update_cache: yes
-      name: haveged
-      state: present
-
- name: enable haveged at boot and start it
-  systemd:
-      name: haveged.service
-      enabled: yes
-      state: started
--- a/roles/install_respondd_poller/tasks/main.yml
+++ b/roles/install_respondd_poller/tasks/main.yml
@ -5,6 +5,7 @@
          - git
          - python-virtualenv
          - python-setuptools
+          - python-pip
      state: present

 - name: create venv
--- a/setup_fastd.yml
+++ b/setup_fastd.yml
@ -12,7 +12,6 @@
      - install_php
      - install_nginx
      - install_ntp
-      - install_haveged
      - setup_batman
      - install_dhcp
      - install_radvd
Author	SHA1	Message	Date
Niklas Yann Wettengel	fccb6ae8f0	aw1, sim2 ff-niyawe1 -> ff-loppermann1	11 months ago
Niklas Yann Wettengel	16f18a1b4c	ems1, my1 ff-niyawe2 -> ff-uniko1	11 months ago
Niklas Yann Wettengel	26402592ad	ko2 ff-niyawe2 -> ff-niyawe1	11 months ago
Niklas Yann Wettengel	0040112ad1	haveged no longer needed	11 months ago
Niklas Yann Wettengel	ea3fb27515	fix ff-loppermann1 ffrl-ips	11 months ago