diff --git a/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix b/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix index e5cb23b..4986a86 100644 --- a/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix +++ b/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix @@ -28,7 +28,7 @@ server.enable = true; secrets = { - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzzAqa4821NlYfALYOlvR7YlOgxNuulTWo9Vm5L1mNU"; + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPUv1ntVrZv5ripsKpcOAnyDQX2PHjowzyhqWK10Ml53"; }; }; diff --git a/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix b/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix index fe9d259..1b24ec3 100644 --- a/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix +++ b/nixos/boxes/colony/vms/shill/containers/jackflix/networking.nix @@ -4,7 +4,7 @@ let inherit (lib.my) networkdAssignment; wg = { - keyFile = "jackflix-wg-privkey.txt"; + keyFile = "jackflix/mullvad-privkey"; fwMark = 42; routeTable = 51820; }; diff --git a/secrets/dhparams.pem.age b/secrets/dhparams.pem.age index e1af127..227deb9 100644 Binary files a/secrets/dhparams.pem.age and b/secrets/dhparams.pem.age differ diff --git a/secrets/estuary/netdata/powerdns.conf.age b/secrets/estuary/netdata/powerdns.conf.age index 2ac2ea6..4ee762f 100644 Binary files a/secrets/estuary/netdata/powerdns.conf.age and b/secrets/estuary/netdata/powerdns.conf.age differ diff --git a/secrets/estuary/netdata/powerdns_recursor.conf.age b/secrets/estuary/netdata/powerdns_recursor.conf.age index 27dacbf..3d5310e 100644 --- a/secrets/estuary/netdata/powerdns_recursor.conf.age +++ b/secrets/estuary/netdata/powerdns_recursor.conf.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 n8CpUw +a8D5DCZQCK5Yv/U+ApOAP8TxcA7cjAXG2aulHdQG2I -9WDr8i1YxZ29daFIeT0yDwhHPNvx87JmBp/Rg5cFOJI --> X25519 tDJjrmPEM9C5JmjhCkXo2a15u0pGubRRuae1xxaFPD8 -tGH3wzDZJzK4BbozX2z9T2yXabriR2fdg4ZVO3KZk/g --> SQa:-&-grease g ~"{ :m ssh-ed25519 n8CpUw jKGiqsAWbpBN+J00jrEo5vqDKgbk8zjh2vBjQ358Hxg +Q1rXDzyXlIfkcAd/NAtzAtg06xKsPKL7ZPbhbMGEItM +-> X25519 I9tfvyVwRvD4V7FvwiiKylz6ju3QyuJkSlKpabqN11M +ZBeuhP/gCmABHIeY310xX0ySpzo0iLDS6Bvb5czrrUk +-> 5-grease YR%W&-wu W\}D xqfc&UH fCCRrbPp +RLGT8KYDcpXBbvGJxdN0iMTeGH1OR/ZQxuXBaClXAH0BFo/YL/ncnw7cSVpDBWnN +4YsDTBYo +--- 6mxmM5cE3KL0zBf9qGXg9PTLitJy2Oq6M21nhB2E71Y +'ɡV^_ph)YPЇ!6ovI!@!)q=K=^(jfCKC߈V~߳ۡNTx;4^cSS0~Im#5c|gh1X̿H cN \ No newline at end of file diff --git a/secrets/estuary/pdns/auth.conf.age b/secrets/estuary/pdns/auth.conf.age index 43f4fac..0dbbd7a 100644 --- a/secrets/estuary/pdns/auth.conf.age +++ b/secrets/estuary/pdns/auth.conf.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 n8CpUw DOBT0UVIyRCCL6hLk/F1El4MbtNYskMz+IMjD4UuOns -NT0PRGlEpQ3YcxHEUdw/90QhD8xGar6id17maVwUdb0 --> X25519 c/SwQBGz826ezLHbZfOPNr0uhqFK6RTvxEA8HDb7+xY -rZa2TqG0icjqMLFE79ouCFqsInQHe7a4FsaY8sPiDl8 --> 0A*gt-grease F:X-O^ - ---- 6nJnd0CERDygNJnpVCIrKQhpmUQJisAV/HgX1RYyf9Q -<*IR iqDOkOs:-]@ch.׊O UMEW%kVC[r \ No newline at end of file +-> ssh-ed25519 n8CpUw nYdDNRkuKV2O6R3Xq8vDZ7CjUG889QT4NP0c8OYs1XA +zEf0rePe3yxQuZdaoeIcaPQbbFXJIB6VUZUdhjIORCg +-> X25519 yKAOrPLmEkUakxRzsNS1qcwAltEwAUiyIsvyp+4dXCg +eRsuGa9bl+qvSDMDThF/X7Ajj2AZdzDcdQCRvzHNh74 +-> W-grease Q.H-b\G BFIi鹨L \ No newline at end of file diff --git a/secrets/estuary/pdns/recursor.conf.age b/secrets/estuary/pdns/recursor.conf.age index 97f501d..16e1555 100644 Binary files a/secrets/estuary/pdns/recursor.conf.age and b/secrets/estuary/pdns/recursor.conf.age differ diff --git a/secrets/jackflix-wg-privkey.txt.age b/secrets/jackflix-wg-privkey.txt.age deleted file mode 100644 index c443dc1..0000000 --- a/secrets/jackflix-wg-privkey.txt.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 vf+WVg 46AUsv9pdxNRa3OqRbBhNCZ4mtmeoQ2/DPBTSiEiZTQ -Ib4PHWRKr1x9hcxjY+DQMpahA3dpTyFzYRZ9JFzcLNc --> X25519 lm03ugY8fnUPThuqOA1zkDjLgF7swWURECXYD+lXZlY -dW9tb6Bv+7ofIhZHV0E5Hq4jhtHMDC0wgQ+trMaPLUE --> @-grease {3]QG.2I OR(T