kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

sophies-stuff #36

Merged
sophie merged 43 commits from sophies-stuff into main 2021-03-13 12:43:44 +00:00
Conversation 0 Commits 43 Files changed 47 +4 -4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f57681b098 - Show all commits

2
nodes/home/router.py
View file

@ -172,7 +172,7 @@ nodes['home.router'] = {
}, },
'wireguard': { 'wireguard': {
# TODO autogenerate? # TODO autogenerate?
'my_ip': '172.19.137.2/32', 'my_ip': '172.19.136.2/32',
'subnets': { 'subnets': {
'172.19.138.0/24', '172.19.138.0/24',
'172.19.139.0/24', '172.19.139.0/24',

2
nodes/ovh/icinga2.py
View file

@ -114,7 +114,7 @@ nodes['ovh.icinga2'] = {
'service_filter': '"checks_with_sms" in service.groups' 'service_filter': '"checks_with_sms" in service.groups'
}, },
'wireguard': { 'wireguard': {
'my_ip': '172.19.137.3/32', 'my_ip': '172.19.136.3/32',
'peers': { 'peers': {
'ovh.wireguard': {}, 'ovh.wireguard': {},
}, },

4
nodes/ovh/wireguard.py
View file

@ -25,12 +25,12 @@ nodes['ovh.wireguard'] = {
}, },
'wireguard': { 'wireguard': {
'network': '172.19.136.0/22', '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'), 'psk': vault.random_bytes_as_base64_for('ovh.icinga2 wireguard psk'),
'peers': { 'peers': {
'kunsi-oneplus3': { 'kunsi-oneplus3': {
'ips': { 'ips': {
'172.19.137.200/32', '172.19.136.100/32',
}, },
'psk': vault.decrypt('encrypt$gAAAAABgKYeeuPfokbk7lSbbJX-52kap5Cs3tdCHpezkKcExV-yLTHPjszIcAh1T9wW1BtGElRdZea7VTikV3qEu3bupiSqEW4l2lmD5cn2ERYRfuVCoYSkOlmEGokHUX7Nja4G_A2_x'), 'psk': vault.decrypt('encrypt$gAAAAABgKYeeuPfokbk7lSbbJX-52kap5Cs3tdCHpezkKcExV-yLTHPjszIcAh1T9wW1BtGElRdZea7VTikV3qEu3bupiSqEW4l2lmD5cn2ERYRfuVCoYSkOlmEGokHUX7Nja4G_A2_x'),
'pubkey': vault.decrypt('encrypt$gAAAAABgKYdTqLG3DcB13QqQadUxyzIjvSxwgZQNjorQi-ADSLsNdDbhikSAGQnSmGelLB74V175awIIir768WEnpLJUKX6nt_i2BxOP3JazvKZSQECkiK8G-IRn8wWWgKarfmtqRwh6'), 'pubkey': vault.decrypt('encrypt$gAAAAABgKYdTqLG3DcB13QqQadUxyzIjvSxwgZQNjorQi-ADSLsNdDbhikSAGQnSmGelLB74V175awIIir768WEnpLJUKX6nt_i2BxOP3JazvKZSQECkiK8G-IRn8wWWgKarfmtqRwh6'),