From f57681b0986f770e223f1a4898cdb98307670e64 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 7 Mar 2021 14:39:04 +0100 Subject: [PATCH] nodes: move wireguard stuff to 172.19.136.0/25 --- nodes/home/router.py | 2 +- nodes/ovh/icinga2.py | 2 +- nodes/ovh/wireguard.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodes/home/router.py b/nodes/home/router.py index d48b4aa..8533bcd 100644 --- a/nodes/home/router.py +++ b/nodes/home/router.py @@ -172,7 +172,7 @@ nodes['home.router'] = { }, 'wireguard': { # TODO autogenerate? - 'my_ip': '172.19.137.2/32', + 'my_ip': '172.19.136.2/32', 'subnets': { '172.19.138.0/24', '172.19.139.0/24', diff --git a/nodes/ovh/icinga2.py b/nodes/ovh/icinga2.py index d2a4ae0..3517189 100644 --- a/nodes/ovh/icinga2.py +++ b/nodes/ovh/icinga2.py @@ -114,7 +114,7 @@ nodes['ovh.icinga2'] = { 'service_filter': '"checks_with_sms" in service.groups' }, 'wireguard': { - 'my_ip': '172.19.137.3/32', + 'my_ip': '172.19.136.3/32', 'peers': { 'ovh.wireguard': {}, }, diff --git a/nodes/ovh/wireguard.py b/nodes/ovh/wireguard.py index c42b5e8..b1c9e12 100644 --- a/nodes/ovh/wireguard.py +++ b/nodes/ovh/wireguard.py @@ -25,12 +25,12 @@ nodes['ovh.wireguard'] = { }, 'wireguard': { 'network': '172.19.136.0/22', - 'my_ip': '172.19.137.1/32', + 'my_ip': '172.19.136.1/32', 'psk': vault.random_bytes_as_base64_for('ovh.icinga2 wireguard psk'), 'peers': { 'kunsi-oneplus3': { 'ips': { - '172.19.137.200/32', + '172.19.136.100/32', }, 'psk': vault.decrypt('encrypt$gAAAAABgKYeeuPfokbk7lSbbJX-52kap5Cs3tdCHpezkKcExV-yLTHPjszIcAh1T9wW1BtGElRdZea7VTikV3qEu3bupiSqEW4l2lmD5cn2ERYRfuVCoYSkOlmEGokHUX7Nja4G_A2_x'), 'pubkey': vault.decrypt('encrypt$gAAAAABgKYdTqLG3DcB13QqQadUxyzIjvSxwgZQNjorQi-ADSLsNdDbhikSAGQnSmGelLB74V175awIIir768WEnpLJUKX6nt_i2BxOP3JazvKZSQECkiK8G-IRn8wWWgKarfmtqRwh6'),