hastur: switch to ovpn

14 files changed, 24 insertions, 29 deletions

diff --git a/epistemia/secrets/email_13f0.age b/epistemia/secrets/email_13f0.age
index 205d353..e76989a 100644
--- a/epistemia/secrets/email_13f0.age
+++ b/epistemia/secrets/email_13f0.age
diff --git a/epistemia/secrets/email_vinbiz.age b/epistemia/secrets/email_vinbiz.age
index 2c19cab..5142e2c 100644
--- a/epistemia/secrets/email_vinbiz.age
+++ b/epistemia/secrets/email_vinbiz.age
diff --git a/epistemia/secrets/email_vineetk.age b/epistemia/secrets/email_vineetk.age
index f8c7417..e6e661c 100644
--- a/epistemia/secrets/email_vineetk.age
+++ b/epistemia/secrets/email_vineetk.age
diff --git a/epistemia/secrets/saklas_smtpd_dkim.age b/epistemia/secrets/saklas_smtpd_dkim.age
index d0e3276..6d73dd1 100644
--- a/epistemia/secrets/saklas_smtpd_dkim.age
+++ b/epistemia/secrets/saklas_smtpd_dkim.age
diff --git a/epistemia/secrets/saklas_smtpd_passwd.age b/epistemia/secrets/saklas_smtpd_passwd.age
index 799a07b..ab53e21 100644
--- a/epistemia/secrets/saklas_smtpd_passwd.age
+++ b/epistemia/secrets/saklas_smtpd_passwd.age
diff --git a/epistemia/secrets/saklas_smtpd_virtuals.age b/epistemia/secrets/saklas_smtpd_virtuals.age
index 15f4ff3..e30e567 100644
--- a/epistemia/secrets/saklas_smtpd_virtuals.age
+++ b/epistemia/secrets/saklas_smtpd_virtuals.age
diff --git a/epistemia/secrets/wg0_demiurge.age b/epistemia/secrets/wg0_demiurge.age
index 89a6885..a0f0dd6 100644
--- a/epistemia/secrets/wg0_demiurge.age
+++ b/epistemia/secrets/wg0_demiurge.age
diff --git a/epistemia/secrets/wg0_hastur.age b/epistemia/secrets/wg0_hastur.age
index ec44456..becae21 100644
--- a/epistemia/secrets/wg0_hastur.age
+++ b/epistemia/secrets/wg0_hastur.age
diff --git a/epistemia/secrets/wg1_demiurge.age b/epistemia/secrets/wg1_demiurge.age
index 9fb60d0..495404f 100644
--- a/epistemia/secrets/wg1_demiurge.age
+++ b/epistemia/secrets/wg1_demiurge.age
@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 947m3A fXIUrNv0IojINXyVa/Cvvm4zmc2UTHQBiKoNfKh0NE0
-GhxWAa9O6U5lL1+29NggBrVMbjSs2HfmKDlNmdmPsm4
--> ssh-ed25519 AaF/mQ 6vKCBXfLx6FIkbshMZzLytJDnBW85iFpE7DE5pn1wj0
-HTQAYzZCFZeS6qKXAW8bLqbG+ZV1EDkne8YFApdjgY0
---- p1ktvPEEihs7qWyT3JCtlaVwvWdtbjzwOwx4pY/feTU
-�&ֱ��iUa�
t���p�o �Vl���,�-�@o��Ϙ�sj�����F��/����t.���Ώ���<�.I
\ No newline at end of file
+-> ssh-ed25519 947m3A n7opQY4khE4wM6C1zuVDaYIEm3cLb3SReR++lqGWdx4
+r8+CE6CpxxBJV4Es9oTy78fI6h7me5oSgsrxNnWM+0U
+-> ssh-ed25519 AaF/mQ Yc59z7xLHhu+zmwxUASQYEnOvhKSfQolHOlfHVev3GI
+bOcwZgIiW9pv/8LArf0zgIGejy89Y1D+LGJP2i84oYw
+--- 66kcCSsmNuTt7kyByR7KJoU9APL96uRCMa0ZjUExr2c
+��������@���d3�q�ޢF9/�����H-����L<�m�q�:��?�%�ْ�^K�C�w����M�
\ No newline at end of file
diff --git a/epistemia/secrets/wg1_hastur.age b/epistemia/secrets/wg1_hastur.age
index d6a47ee..8adcd64 100644
--- a/epistemia/secrets/wg1_hastur.age
+++ b/epistemia/secrets/wg1_hastur.age
@@ -1,8 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 M+PQbg gaqg8RGyQuO/T5+zsSieRzIQiZnkZGNWdKI/6Ee1bns
-nfLB4usM9vy5g6l0JeZdF0Ku4qN9jjaO3En4Mrc8jEI
--> ssh-ed25519 AaF/mQ 4G/JcTRS8yh9rfo5yUvgtOy5GzP1x7OP+yuoI1rp5mQ
-c8mWNlM7ayAXhOCd+YuoCN+cT7jNVLXmr4FVpg4vLrc
---- 6StQqfXgqnDCyyTVBmDRotRhGK192ZT5y+j59RMFgjc
-���0��-�̷�
-H��J9p�ҿT�Dݗ1�{`m~JB�i�v���?�HS���rQ,��3'��.���Z|w
\ No newline at end of file
+-> ssh-ed25519 M+PQbg V2nYYQl/V043uOSAnZGisO9P1KLbpKxNV3mE6WIt8Rs
+yWALreRbzMVZ4SFhITokiqrMKSt0XltYQdTnoXgR8pU
+-> ssh-ed25519 AaF/mQ TvQfvCNrpFX5bBVn37I/MJ9WH+cD99bM7H76suzEXWc
+qvAhpE3wwPVdkGcSBq+Kyz9SEPZw4VlqRTAtq9/KGOc
+--- LesFfan7bUIHmyFt2wFFlqTkzmfFBEb+qqjncUM8w9k
+4�r=�V�̊�tI}s�G�"�2W�V�����j���.�=�b,n���=�2�*Iwҿ���/���*�Q}ud
\ No newline at end of file
diff --git a/epistemia/secrets/wg1_saklas.age b/epistemia/secrets/wg1_saklas.age
index b133647..87c31db 100644
--- a/epistemia/secrets/wg1_saklas.age
+++ b/epistemia/secrets/wg1_saklas.age
diff --git a/epistemia/secrets/wg2_hastur.age b/epistemia/secrets/wg2_hastur.age
index e2dea60..14bee79 100644
--- a/epistemia/secrets/wg2_hastur.age
+++ b/epistemia/secrets/wg2_hastur.age
@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 M+PQbg 5Ir4lFl9EOOYkZenTaVhvD+ScI21s7iStJvK97Rfzjc
-XIBbGepNLLfNrRTKNZbrxM+SsQuEwbc86myQknnAMSo
--> ssh-ed25519 AaF/mQ B5+0FYrZHqRiip4qO2ZNeopA0BR31V8Btvs3cVjKJUg
-Zh+/AJI1aJCxn55xkIkkK4yyjBaPU8zLPXflam6J1sA
---- gKrq3vgOIv+0MMZKCsbMBW0PSVsgoIwoYO+7SvENJlw
-#�����x��Əf�,��V���/M�]�t3w  �`�@S^�3��\��^�|R3�r�U�ő��?��,�;���
\ No newline at end of file
+-> ssh-ed25519 M+PQbg 4+Z32ofisz0okBTCz1RcJme731LxAHQSywVf/LIvJlw
+OVwG4og7LV/bn5fuYQVTXo/UZyuQ5gFiLvQqQnRQCuI
+-> ssh-ed25519 AaF/mQ NjakoECggxFp7H2A9NZjT5S3aECX5yXIAFKYclANNHw
+KH0wOiIuUc2GPG9O8tne7zGxjm51m83vfiGpaaBUJww
+--- hgUv7OhoEY2rcq7lkvI/oosehKqrVxnlwEqX0d29l+o
+4��h�4�aW��e$�O��M/,K]�+A���R�b_9�z����,�4�V�ޔT���}��Md�q��Y�_[teL�     �
\ No newline at end of file
diff --git a/epistemia/secrets/wpa_supplicant.age b/epistemia/secrets/wpa_supplicant.age
index 8c4b683..fda9555 100644
--- a/epistemia/secrets/wpa_supplicant.age
+++ b/epistemia/secrets/wpa_supplicant.age
diff --git a/epistemia/systems/hastur.scm b/epistemia/systems/hastur.scm
index 57cefc0..273c5fb 100644
--- a/epistemia/systems/hastur.scm
+++ b/epistemia/systems/hastur.scm
@@ -107,9 +107,6 @@
                                                                 (name "wg0_hastur")
                                                                 (file (local-file "../secrets/wg0_hastur.age")))
                                                                (age-secret
-                                                                (name "wg0psk_hastur")
-                                                                (file (local-file "../secrets/wg0psk_hastur.age")))
-                                                               (age-secret
                                                                 (name "wg1_hastur")
                                                                 (file (local-file "../secrets/wg1_hastur.age")))
                                                                (age-secret
@@ -171,23 +168,22 @@
                                            (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.27.194.145/32" "fd00:0000:1337:cafe:1111:1111:9893:6822/128"))
                                                      (port 51821)
                                                      (bootstrap-private-key? #f)
                                                      (shepherd-requirement '(age-secret wpa-supplicant))
                                                      (private-key "/run/secrets/wg0_hastur")
                                                      (pre-up '("while [ ! -f /run/secrets/wg0_hastur ]; do sleep 1; done"
                                                                "while [ -z \"$(ip route show default)\" ]; do sleep 1; done"
-                                                               "ip route add 184.75.221.173 via $(ip route show default | cut -d' ' -f3) dev wlan0"))
-                                                     (post-down '("ip route del 184.75.221.173"))
+                                                               "ip route add 185.157.162.7 via $(ip route show default | cut -d' ' -f3) dev wlan0"))
+                                                     (post-down '("ip route del 185.157.162.7"))
                                                      (peers
                                                       (list
                                                        (wireguard-peer
-                                                        (name "airvpn-canada")
-                                                        (public-key "PyLCXAQT8KkM4T+dUsOQfn+Ub3pGxfGlxkIApuig+hk=")
-                                                        (preshared-key "/run/secrets/wg0psk_hastur")
+                                                        (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")