demiurge: change to ovpn

2 files changed, 6 insertions, 11 deletions

diff --git a/epistemia/secrets/rekey.scm b/epistemia/secrets/rekey.scm
index 36b0063..3da6147 100755
--- a/epistemia/secrets/rekey.scm
+++ b/epistemia/secrets/rekey.scm
@@ -22,7 +22,6 @@
     ("saklas_smtpd_passwd"   . ,saklas)
     ("saklas_smtpd_virtuals" . ,saklas)
     ("wg0_demiurge"          . ,demiurge)
-    ("wg0psk_demiurge"       . ,demiurge)
     ("wg1_demiurge"          . ,demiurge)
     ("wg0_hastur"            . ,hastur)
     ("wg0psk_hastur"         . ,hastur)
diff --git a/epistemia/systems/demiurge.scm b/epistemia/systems/demiurge.scm
index 34d007d..2dce07d 100644
--- a/epistemia/systems/demiurge.scm
+++ b/epistemia/systems/demiurge.scm
@@ -121,9 +121,6 @@
                                                                (name "wg0_demiurge")
                                                                (file (local-file "../secrets/wg0_demiurge.age")))
                                                               (age-secret
-                                                               (name "wg0psk_demiurge")
-                                                               (file (local-file "../secrets/wg0psk_demiurge.age")))
-                                                              (age-secret
                                                                (name "wg1_demiurge")
                                                                (file (local-file "../secrets/wg1_demiurge.age")))))))
                                           (simple-service 'zfs-loader
@@ -190,12 +187,12 @@
                                           (service wireguard-service-type
                                                    (wireguard-configuration
                                                     (interface "wg0")
-                                                    (addresses '("10.179.194.21/32" "fd7d:76ee:e68f:a993:cee4:5b6c:bce1:9350/128"))
+                                                    (addresses '("172.26.55.213/32" "fd00:0000:1337:cafe:1111:1111:4975:4c1d/128"))
                                                     (port 51821)
                                                     (bootstrap-private-key? #f)
                                                     (private-key "/run/secrets/wg0_demiurge")
                                                     (pre-up '("while [ ! -f /run/secrets/wg0_demiurge ]; do sleep 1; done"
-                                                              "ip route replace 184.75.221.173 via 192.168.1.1 dev eth0"))
+                                                              "ip route replace 185.157.162.7 via 192.168.1.1 dev eth0"))
                                                     (post-up
                                                      (list "ip rule add fwmark 0x1 table 100 priority 100"
                                                            "ip rule add fwmark 51820 table 100 priority 100"
@@ -204,7 +201,7 @@
                                                            #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A PREROUTING -i eth0 -j CONNMARK --restore-mark")
                                                            #~(string-append #$(file-append iptables "/sbin/iptables") " -t mangle -A OUTPUT -m conntrack --ctstate ESTABLISHED,RELATED -j CONNMARK --restore-mark")))
                                                     (post-down
-                                                     (list "ip route del 184.75.221.173 via 192.168.1.1 dev eth0"
+                                                     (list "ip route del 185.157.162.7 via 192.168.1.1 dev eth0"
                                                            "ip rule del fwmark 0x1 table 100"
                                                            "ip rule del fwmark 51820 table 100"
                                                            "ip route flush table 100"
@@ -214,11 +211,10 @@
                                                     (peers
                                                      (list
                                                       (wireguard-peer
-                                                       (name "airvpn-canada")
-                                                       (public-key "PyLCXAQT8KkM4T+dUsOQfn+Ub3pGxfGlxkIApuig+hk=")
-                                                       (preshared-key "/run/secrets/wg0psk_demiurge")
+                                                       (name "ovpn-ams-29")
+                                                       (public-key "wTlz3u1egzUrx4Ho02cL7Ht1BBa/C8bULzXStn5f+zk=")
                                                        (allowed-ips '("0.0.0.0/0" "::0/0"))
-                                                       (endpoint "184.75.221.173:1637"))))))
+                                                       (endpoint "185.157.162.7:9929"))))))
                                           (service wireguard-service-type
                                                    (wireguard-configuration
                                                     (interface "wg1")