diff --git a/salt-pillar/bind/dyndns/anon1.sls b/salt-pillar/bind/dyndns/anon1.sls index 35cf4ec..b6e6a3f 100644 --- a/salt-pillar/bind/dyndns/anon1.sls +++ b/salt-pillar/bind/dyndns/anon1.sls @@ -1,7 +1,7 @@ #!yaml|gpg dyndns: anon1: - interface: protonvpn + interface: ipredator secret: | -----BEGIN PGP MESSAGE----- diff --git a/salt-pillar/top.sls b/salt-pillar/top.sls index c30d963..c536542 100644 --- a/salt-pillar/top.sls +++ b/salt-pillar/top.sls @@ -41,7 +41,7 @@ base: - bind.dyndns.upstream2 'anon*': - bird.ospf - - vpn.anon1 + - wireguard.anon1 - upstream.anon1 - collectd.upstream - bind.dyndns.anon1 diff --git a/salt-pillar/wireguard/anon1.sls b/salt-pillar/wireguard/anon1.sls index b01dace..2039a42 100644 --- a/salt-pillar/wireguard/anon1.sls +++ b/salt-pillar/wireguard/anon1.sls @@ -1,20 +1,20 @@ #!yaml|gpg wireguard-instances: - 'mullvad': + 'njalla': private_key: | -----BEGIN PGP MESSAGE----- - hQEMA2PKcvDMvlKLAQf/UlrdkStvB3GNrCoEOYGgStNHnxA47f1Pyy/psebzOewD - 4o7jUIMjeNLM/6BxNTdm4FQ/LG5oF4orIRzxoTDxpwYx/H0pzKEJbtMkX7hD+Hn/ - VaTlQFgmATL8laScZ6GhUCBDdH0Mo5ZETMoytgGXvNWsjSNrEQi/e41C2aaByXdl - FCNR9DfG8RBGzLuJCnqsgU2PlOzWmqK2qJWMavI6pwSgkbfmpEWJsNCrKurOnA3J - 06VClqyX/ni5h19TmC/3moFA6xrv+8ttDEKTPXiQ37OUYsSYmMB8of9MxOWPQVPI - zm7PAlOeKh3cnhuiyqS2FKcPJ4DdO4bvt2wQF9A6ZNJnAVJgHbc4WnsO31hwy499 - iVW/91FHra9dO5XVmiZAPl99ageAVy6iaohgrkjfLffwTuaiSG0BC7kYF+dIPUYm - Fy6FrkI53kzPzqhMTKlOZ72CJDKhN9SDV1cjJy7/+DQ76Kzn402D7w== - =NooJ + hQEMA2PKcvDMvlKLAQgAjHgR9t14E1Oi656NTRT10iWLCwAb2byqRseWy6wZox9k + +miYqurhaOrFtDuzytrHVtaiPxrZeLtNgDCqk9M0f5vV/JpHnYe6mQZG7RXU1lew + dubtoCakyRjmQ4UJAWcB7CHV038q34/ZnOP21XbFGxZlYfrbQUwCbUAS+lRQH92J + zCSba7UKosmZHYmn6IrATK7/rvDqO/nPvvWO3OTL/AsK2HC364Qi/2jRfe3DHqNB + hoJ49MzgTaKgniJgLZhH2pTmitQp9oPcVBH0kMaJzicluqVo8LtnQyvHpudLMZWI + XhXcSOv6FUsgzb+IVm6ggpSl/0w8J8Oe7Ab8OlRCI9JnAXI4Fux/4ZYrPKUrCOII + rbW8L9D7oThhM37tVgyvmCT6Hkgeta6IHFUV0j4GQ9GtZZa8LoymSKVwsCMGzq/o + aGXXKK4lJL6Rr/T/ZTUvBOEMv4RbfmXjO8DtXyuOdH73915ZTJB7PA== + =1Wqt -----END PGP MESSAGE----- - addr: '10.99.16.190/32,fc00:bbbb:bbbb:bb01::10be/128' + addr: 'fd03:1337::176/64, 10.13.37.176/24' peers: - - public_key: 'Ko5Vhr1L11DRpKBRw6TMXvCaZby6N32R4NQsdTGzfE0=' - endpoint: '185.216.33.114:3018' + - public_key: 'y0zGwVuzZwKqkNkxP1P9A2Zw9H79cRjTZZlXL8+PrVM=' + endpoint: '198.167.192.11:51820' diff --git a/salt/top.sls b/salt/top.sls index b747fdc..a27b6ff 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -48,7 +48,7 @@ base: - no-ssh - forwarding - bird - - vpn.openvpn + - wireguard - upstream.masquerade - upstream.shaping - upstream.nat66 diff --git a/salt/vpn/openvpn.conf b/salt/vpn/openvpn.conf index 0201eab..97c2e99 100644 --- a/salt/vpn/openvpn.conf +++ b/salt/vpn/openvpn.conf @@ -41,9 +41,7 @@ remote-cert-tls server keepalive 10 30 cipher AES-256-CBC -auth SHA512 -comp-lzo no -fast-io +comp-lzo passtos