From 1764c1104b34cf213df4e14065f6e345faa7c2f8 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 8 Feb 2021 16:39:06 +0100
Subject: [PATCH] anon1: fixes

---
 salt-pillar/upstream/anon1.sls |  4 ++--
 salt-pillar/vpn/anon1.sls      | 37 +++++++++++++++++-----------------
 salt/vpn/openvpn.conf          |  1 +
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/salt-pillar/upstream/anon1.sls b/salt-pillar/upstream/anon1.sls
index f0d46ca..4f857b7 100644
--- a/salt-pillar/upstream/anon1.sls
+++ b/salt-pillar/upstream/anon1.sls
@@ -1,5 +1,5 @@
 upstream:
-  interface: mullvad
-  nat66-interface: mullvad
+  interface: protonvpn
+  nat66-interface: protonvpn
   up-bandwidth: 45000
   flows: 4096
diff --git a/salt-pillar/vpn/anon1.sls b/salt-pillar/vpn/anon1.sls
index 7c79522..b2996d6 100644
--- a/salt-pillar/vpn/anon1.sls
+++ b/salt-pillar/vpn/anon1.sls
@@ -64,21 +64,22 @@ openvpn:
       A1gTTlpi7A==
       -----END CERTIFICATE-----
     key: |
-      -----BEGIN OpenVPN Static key V1-----
-      6acef03f62675b4b1bbd03e53b187727
-      423cea742242106cb2916a8a4c829756
-      3d22c7e5cef430b1103c6f66eb1fc5b3
-      75a672f158e2e2e936c3faa48b035a6d
-      e17beaac23b5f03b10b868d53d03521d
-      8ba115059da777a60cbfd7b2c9c57472
-      78a15b8f6e68a3ef7fd583ec9f398c8b
-      d4735dab40cbd1e3c62a822e97489186
-      c30a0b48c7c38ea32ceb056d3fa5a710
-      e10ccc7a0ddb363b08c3d2777a3395e1
-      0c0b6080f56309192ab5aacd4b45f55d
-      a61fc77af39bd81a19218a79762c3386
-      2df55785075f37d8c71dc8a42097ee43
-      344739a0dd48d03025b0450cf1fb5e8c
-      aeb893d9a96d1f15519bb3c4dcb40ee3
-      16672ea16c012664f8a9f11255518deb
-      -----END OpenVPN Static key V1-----
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf+IvF6zK4TMYgQIrt30zB2QGPU28pRD6gAmcEJman1QzH6
+      vMrjONchjC3qTE9GVhFlyuxHZaYHFOFEW8y7JV7VBR0BGWa5WwalbXngkyJfL/SM
+      A2zXH/7d5w1TBM0uJBb3vCKeqjBnw47Vm5jDh2CG7kJuD08330WNpnl2pZJebDBH
+      IWbcGrI8M45fcPS3ui2HM+PoFUmVNP3EaXRSxLQlK4CpQjVmz7Adf11+f1HotYE5
+      V5DIbqF0nqYdMgekg026d4TwZbhX8kAXtiJmGVd9Wwy6Osq9gGb8QmbjMNRpjdRp
+      1P2dD5HIdipmWQDCc+NEoowzsNobSteq+yz8mmCfPNLA/gHOCApyk/YeVjxpTaJU
+      OLlHBcZ2p35pc+aeKhxQyKqSr8dEnGrgWLjiHxo637D2PtI9NGGxOdEzPTeYzvzq
+      Gf9qIWmYWQdFiHcWGn42p8/sdSaqrixGNUhwc9ZnXzBaGF2j4mJ5lR8pgorfr2Wc
+      wOPQRFAwxFRMXonPvOHRYb8ARs7JWAMjqtEDbnaHYmvduqWYEpKZeUqlKAyl5d4h
+      Pou1u8W6HeFSOK5Dz/wSTHUB+/COLoR4xMv+ChBGWQkex4TlMzGroe0VjK4Zf4Ya
+      IPu/MZF6Pqi9AN+yydUnkpZWYcICGH5NPy7gVt8okKuAhqYJcrq5JTvqvyUTNdS2
+      icdTSPNY2k3+YvLmDwCqolIjB+kjOKjZw2bjZ1HV7RCrKJhXOxdyd9ktGFOlNCtw
+      UHZoIFg0TCYxEvNHoZyjJzp9V0d/CQBBCYmwD9hIFr602WQv7+Ro6b4CFCFXytOC
+      msSAsLx1oBgJAOs9lcBwD7nCyWNwsk/MsE9OsJICYA/8ZzJPuqcJLwEm9tmPcWGF
+      0ws4GJAet9U4TDwUEYdV9AvcBsl5MHNb4cgIfPuJWZ11Wx2MQ9RuD6L8fDI5H8wI
+      =164/
+      -----END PGP MESSAGE-----
diff --git a/salt/vpn/openvpn.conf b/salt/vpn/openvpn.conf
index d01ec95..2bbfed2 100644
--- a/salt/vpn/openvpn.conf
+++ b/salt/vpn/openvpn.conf
@@ -55,6 +55,7 @@ verb 1
 {{ conf['ca'] }}
 </ca>
 
+key-direction 1
 <tls-auth>
 {{ conf['key'] }}
 </tls-auth>