From 299716ee3153b7fb9f37ffcf95022bea5859e69f Mon Sep 17 00:00:00 2001 From: Niklas Yann Wettengel Date: Thu, 21 Mar 2024 20:51:10 +0100 Subject: ff-niyawe1 -> ff-niyawe3 --- host_vars/ff-niyawe1 | 183 -------------------------------- host_vars/ff-niyawe3 | 183 ++++++++++++++++++++++++++++++++ inventory.ini | 2 +- roles/install_monitoring/tasks/main.yml | 2 +- 4 files changed, 185 insertions(+), 185 deletions(-) delete mode 100644 host_vars/ff-niyawe1 create mode 100644 host_vars/ff-niyawe3 diff --git a/host_vars/ff-niyawe1 b/host_vars/ff-niyawe1 deleted file mode 100644 index 539c4ba..0000000 --- a/host_vars/ff-niyawe1 +++ /dev/null @@ -1,183 +0,0 @@ ---- -ansible_host: 2a01:4f8:272:3d5f:2::2 -#ansible_host: 10.0.1.6 -sites: - - 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.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' - 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' -wireguard_bb_name: 'niyawe1' -wireguard_bb_endpoint: '{{ ansible_host }}' -wireguard_bb_priv_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 62623537663537643532356163613166336165323463663033303431613136353936383439383036 - 3935323633386166633632626361383030653762623935630a356536393039303237326662656266 - 62326135303961636566616532663634343339666464383965343539653365643533383435313465 - 3435616562633531350a623932313866633065376435313365633062383630303836386361393938 - 65303266646135623234333935313566383864646337393130663733626331333134653732393264 - 3432383464363035626331393662343430366664613739306364 -wireguard_bb_pub_key: 'zGubrJd9Wfa1Yo9I5xyJArdvX1bj7OS2VFth289PdlU=' -wireguard_bb_ipv4: '10.222.0.11' -wireguard_bb_ipv6: 'fe80::ffbb:ffbb:11' -wireguard_bb_port: 10111 -wireguard_vpn_port: 10010 -wireguard_vpn_priv_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 34313130643739316461343031626565323930303465623238356636636531656630396433383036 - 6337386336633165636633353139323366323563333464380a393438343365363661633331356438 - 62326531336666326662323535366463333265313130343430653162646461383230363064366264 - 6431663833633537660a343830623735633330643935363232366532346664353834623636326462 - 33393133363464313665623963393534306235653239636438343537366533306166623535663336 - 3864646261313135386563613637613330343935333636633434 -wireguard_vpn_address: 'fe80::7e:adff:fefc:0b8c' -wireguard_vpn_client_range: '2a03:2260:1016:1000::/52' -tayga_ipv4: 10.1.0.1 -tayga_pool: 10.1.0.0/16 -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' diff --git a/host_vars/ff-niyawe3 b/host_vars/ff-niyawe3 new file mode 100644 index 0000000..88e093e --- /dev/null +++ b/host_vars/ff-niyawe3 @@ -0,0 +1,183 @@ +--- +ansible_host: 2a01:4f8:141:1063:2::2 +#ansible_host: 10.0.1.6 +sites: + - 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.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' + 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' +wireguard_bb_name: 'niyawe3' +wireguard_bb_endpoint: '{{ ansible_host }}' +wireguard_bb_priv_key: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 62623537663537643532356163613166336165323463663033303431613136353936383439383036 + 3935323633386166633632626361383030653762623935630a356536393039303237326662656266 + 62326135303961636566616532663634343339666464383965343539653365643533383435313465 + 3435616562633531350a623932313866633065376435313365633062383630303836386361393938 + 65303266646135623234333935313566383864646337393130663733626331333134653732393264 + 3432383464363035626331393662343430366664613739306364 +wireguard_bb_pub_key: 'zGubrJd9Wfa1Yo9I5xyJArdvX1bj7OS2VFth289PdlU=' +wireguard_bb_ipv4: '10.222.0.11' +wireguard_bb_ipv6: 'fe80::ffbb:ffbb:11' +wireguard_bb_port: 10111 +wireguard_vpn_port: 10010 +wireguard_vpn_priv_key: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 34313130643739316461343031626565323930303465623238356636636531656630396433383036 + 6337386336633165636633353139323366323563333464380a393438343365363661633331356438 + 62326531336666326662323535366463333265313130343430653162646461383230363064366264 + 6431663833633537660a343830623735633330643935363232366532346664353834623636326462 + 33393133363464313665623963393534306235653239636438343537366533306166623535663336 + 3864646261313135386563613637613330343935333636633434 +wireguard_vpn_address: 'fe80::7e:adff:fefc:0b8c' +wireguard_vpn_client_range: '2a03:2260:1016:1000::/52' +tayga_ipv4: 10.1.0.1 +tayga_pool: 10.1.0.0/16 +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' diff --git a/inventory.ini b/inventory.ini index f2adfe9..ea5c343 100644 --- a/inventory.ini +++ b/inventory.ini @@ -1,5 +1,5 @@ [fastd] -ff-niyawe1 ff-niyawe2 +ff-niyawe3 ff-loppermann1 ff-uniko1 diff --git a/roles/install_monitoring/tasks/main.yml b/roles/install_monitoring/tasks/main.yml index dc3c445..8893368 100644 --- a/roles/install_monitoring/tasks/main.yml +++ b/roles/install_monitoring/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: install ffmyk-influx - include: install_ffmyk-influx.yml + import_tasks: install_ffmyk-influx.yml - name: install munin import_tasks: install_munin.yml -- cgit v1.2.3-54-g00ecf