From 97de7f4f4945faa9efd9c53bdba8347dc38107f7 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sun, 9 Oct 2022 15:46:45 +0100
Subject: [PATCH] nixos/jackflix: Use Amsterdam VPN

---
 .../shill/containers/jackflix/networking.nix   | 10 +++++-----
 secrets/jackflix/mullvad-privkey.age           | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix b/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix
index 1b24ec3..b70aa7f 100644
--- a/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix
+++ b/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix
@@ -10,7 +10,7 @@ let
   };
 
   # Forwarded in Mullvad config
-  transmissionPeerPort = 55471;
+  transmissionPeerPort = 56528;
 in
 {
   config = mkMerge [
@@ -64,10 +64,10 @@ in
             };
             wireguardPeers = [
               {
-                # mlvd-de32
+                # mlvd-ams-wg-202
                 wireguardPeerConfig = {
-                  Endpoint = "146.70.107.194:51820";
-                  PublicKey = "uKTC5oP/zfn6SSjayiXDDR9L82X0tGYJd5LVn5kzyCc=";
+                  Endpoint = "169.150.196.15:51820";
+                  PublicKey = "BChJDLOwZu9Q1oH0UcrxcHP6xxHhyRbjrBUsE0e07Vk=";
                   AllowedIPs = [ "0.0.0.0/0" "::/0" ];
                 };
               }
@@ -83,7 +83,7 @@ in
             ];
             "90-vpn" = with wg; {
               matchConfig.Name = "vpn";
-              address = [ "10.68.19.11/32" "fc00:bbbb:bbbb:bb01::5:130a/128" ];
+              address = [ "10.67.83.59/32" "fc00:bbbb:bbbb:bb01::4:533a/128" ];
               dns = [ "10.64.0.1" ];
               routingPolicyRules = map (r: { routingPolicyRuleConfig = r; }) [
                 {
diff --git a/secrets/jackflix/mullvad-privkey.age b/secrets/jackflix/mullvad-privkey.age
index 7073420..d7e13e4 100644
--- a/secrets/jackflix/mullvad-privkey.age
+++ b/secrets/jackflix/mullvad-privkey.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 hMa4nw aCklPDPeZ+brAXaOg/ZXw7gURAAjGWYcfIm91REqHW0
-8+BKv9OaovY28n1ppuVCMQbLNhMGvypg3QaBTfhVINM
--> X25519 YKATZj9hZuun2ZsXsyK66cUnUv9GsXxV7H4KBrNiG2Q
-y2a7RJtMsojzLuvxo9qjdf1kBAnktY74mpXU37XL7wU
--> }y7!3c-grease
-Zx1rwgQvzpR1B46eZPICZ8KZxGISuAm+H11GhX0Lj3sE1nlhVrhxKlra3r3vJkRF
-
---- 47N0OYtTS/jTKMbNAw/776jeiyOikYvpxXOnF653zZw
-�f�pՍ��c�.]'��uy��kt�$��=ze��p�ޱ�\Y��J)�vӝjہr�q~�K-�$�O�LժoEΐ�
\ No newline at end of file
+-> ssh-ed25519 hMa4nw MwolKeBP/4SG8OurKBLUNV37funq9wwH6DYEaz90ICs
+yxl+SoMBcwWdci24KPZq3tVmUqdkHE+mFIVP5Bo98Ow
+-> X25519 SXydK8eQG7GSOaOjyh3w9qQ9z71ZbH0z3pFStqafdmE
+BdSBQtYolKcUsjVXl5hWTX+rxyX0+wdtWp8Hc0MG1RQ
+-> gH"%l-grease N_Qu^ pH &TD(S{
+gbBsQcxinwIDpley0KyH3YFUlCvDQpTalOjo0/guLa1l9C2IOJ5C8E7N+Sc9z3Xs
+3MC68N5BtXAL6BDqpRTV086nGrMrfs64Y/8dGuo
+--- VzcI2EK38TT2dqbQoZ/d/2Kk3QRGuDZHUUXF+MLahXo
+�0%��];*MK�܇���g��u�1�Ύ�)g�Yq��r(�n|��~����Ŕ�B"��k�K�7�(~�lVR��
\ No newline at end of file