From 9eca58e0a4825c2168b6a4259ba2c0f021c0968c Mon Sep 17 00:00:00 2001 From: "Agatha V. Lovelace" Date: Wed, 22 May 2024 02:10:22 +0200 Subject: [PATCH] Migrate to Hurricane Electric DNS --- flake.lock | 69 ++++++++++++---------------- flake.nix | 4 +- hosts/bloodletting/configuration.nix | 8 ++-- 3 files changed, 36 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 8bc3103..307e3dd 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1701025348, - "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=", + "lastModified": 1709610799, + "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", "owner": "ipetkov", "repo": "crane", - "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b", + "rev": "81c393c776d5379c030607866afef6406ca1be57", "type": "github" }, "original": { @@ -139,11 +139,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709365644, - "narHash": "sha256-NuGjkskwP5TIkNOrZRDNeOOWUMpd0twV4qgkiTyv9P8=", + "lastModified": 1714732742, + "narHash": "sha256-tvZiMfL0TEiZGe5lOAk0Qrmsigc5UNRDootbEGUV58o=", "owner": "helix-editor", "repo": "helix", - "rev": "d769fadde085169c26a850966a6d5d8da7cc1c12", + "rev": "7e13213e7430c95cbad210994cecbfadc52c0714", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1714043624, + "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", "type": "github" }, "original": { @@ -371,7 +371,10 @@ }, "naersk_4": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "url-eater", + "nixpkgs" + ] }, "locked": { "lastModified": 1698420672, @@ -440,11 +443,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709294055, - "narHash": "sha256-7EECkQYoNKJZOf2+miJdrMpxpvsn/qZFwIhUI3fQpLs=", + "lastModified": 1714656196, + "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec869190b56a1b4677d24a8bdbcfe80ccea2ece6", + "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", "type": "github" }, "original": { @@ -499,11 +502,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709309926, - "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", + "lastModified": 1714531828, + "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", + "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", "type": "github" }, "original": { @@ -513,20 +516,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1682092588, "narHash": "sha256-NjKBPnScpbGiH/YOx74DIFOVkr5AKJOVZoy0l7J58gk=", @@ -571,11 +560,11 @@ ] }, "locked": { - "lastModified": 1701137803, - "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=", + "lastModified": 1709604635, + "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9dd940c967502f844eacea52a61e9596268d4f70", + "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", "type": "github" }, "original": { @@ -750,11 +739,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1705955798, - "narHash": "sha256-lN3AnOCz5thhFhnj8xN7KuuUrAbG9FrvUcNJ3Ys45NU=", + "lastModified": 1710529176, + "narHash": "sha256-TuDrnw1USxWsGQMQuX50D69A3Z555vC0Q0knYcd/qGE=", "owner": "AgathaSorceress", "repo": "url-eater", - "rev": "3ea3d1363d61654d489f31578994bcb799b683b2", + "rev": "21be820dcd6fa5c91e9a46fb8c72f13db631ed54", "type": "github" }, "original": { @@ -873,7 +862,7 @@ }, "vampysite": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "utils": "utils_6" }, "locked": { diff --git a/flake.nix b/flake.nix index 8d542a9..88d418f 100644 --- a/flake.nix +++ b/flake.nix @@ -143,8 +143,8 @@ keyCommand = [ "cat" "./secrets/nyandroid-token" ]; destDir = "/var/lib/secrets/"; }; - "rfc2136-technogothic-net" = { - keyCommand = [ "cat" "./secrets/rfc2136-technogothic-net" ]; + "hurricane-tokens" = { + keyCommand = [ "cat" "./secrets/hurricane-tokens" ]; destDir = "/var/lib/secrets/"; }; "fedi-data.toml" = { diff --git a/hosts/bloodletting/configuration.nix b/hosts/bloodletting/configuration.nix index dda3c1d..963d6b3 100644 --- a/hosts/bloodletting/configuration.nix +++ b/hosts/bloodletting/configuration.nix @@ -84,9 +84,9 @@ security.acme.certs."technogothic.net" = { domain = "*.technogothic.net"; - extraDomainNames = [ "technogothic.net" ]; - dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/rfc2136-technogothic-net"; + extraDomainNames = [ "technogothic.net" "*.argent.technogothic.net" ]; + dnsProvider = "hurricane"; + credentialsFile = "/var/lib/secrets/hurricane-tokens"; group = "nginx"; }; @@ -137,6 +137,8 @@ ''; }; + locations."=/5idbsp9q8d.txt".return = "200 uwu"; + extraConfig = '' error_page 404 /404.html; '';