From ce0dfe5431a2cd04356e8d526d25a2a8690eadd5 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 1 Feb 2024 13:35:30 +0100 Subject: [PATCH] chore(infra): Remove remnants of dgn-dns --- machines/compute01/_configuration.nix | 1 - meta/nodes.nix | 2 -- modules/default.nix | 1 - npins/sources.json | 13 ------------- scripts/default.nix | 3 --- scripts/ns-update.sh | 13 ------------- 6 files changed, 33 deletions(-) delete mode 100644 scripts/ns-update.sh diff --git a/machines/compute01/_configuration.nix b/machines/compute01/_configuration.nix index 5d251e9..4098036 100644 --- a/machines/compute01/_configuration.nix +++ b/machines/compute01/_configuration.nix @@ -3,7 +3,6 @@ lib.extra.mkConfig { enabledModules = [ # List of modules to enable - "dgn-dns" "dgn-fail2ban" "dgn-web" ]; diff --git a/meta/nodes.nix b/meta/nodes.nix index c877c42..116b022 100644 --- a/meta/nodes.nix +++ b/meta/nodes.nix @@ -29,8 +29,6 @@ builtins.mapAttrs mkNode { }; compute01 = { - deployment.tags = [ "dns" ]; - stateVersion = "23.05"; }; diff --git a/modules/default.nix b/modules/default.nix index 1bc0f59..41a0cbb 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -39,7 +39,6 @@ "dgn-access-control" "dgn-acme" "dgn-console" - "dgn-dns" "dgn-fail2ban" "dgn-hardware" "dgn-network" diff --git a/npins/sources.json b/npins/sources.json index 8ec57c4..349ce1d 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -40,19 +40,6 @@ "url": "https://api.github.com/repos/nix-community/disko/tarball/v1.3.0", "hash": "1lrnvgd5w41wrgidp3vwv2ahpvl0a61c2lai6qs16ri71g00kqn0" }, - "dns.nix": { - "type": "GitRelease", - "repository": { - "type": "Git", - "url": "https://git.hubrecht.ovh/hubrecht/dns.nix" - }, - "pre_releases": false, - "version_upper_bound": null, - "version": "v1.2.1", - "revision": "66979725afe2164491be38ffff78460cc9b0ffd7", - "url": null, - "hash": "1bashjbh71dqs32yld7ihw2vz0vrad73pc35crf3qck8ssgpzv7d" - }, "linkal": { "type": "Git", "repository": { diff --git a/scripts/default.nix b/scripts/default.nix index 3044c23..25dda9d 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -24,10 +24,7 @@ let scripts = [ "check-deployment" - "ns-update" "launch-vm" - # "mk-backup-key" - # "wg-setup" ]; in diff --git a/scripts/ns-update.sh b/scripts/ns-update.sh deleted file mode 100644 index d909afa..0000000 --- a/scripts/ns-update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!@bash@/bin/bash - -cd "$(@git@/bin/git rev-parse --show-toplevel)" - -SERIAL=$(@coreutils@/bin/cat modules/dgn-dns/serial.nix) -T_SERIAL="$(@coreutils@/bin/date +'%Y%m%d')00" - -N_SERIAL=$(( ( SERIAL >= T_SERIAL ? SERIAL : T_SERIAL ) + 1 )) - -echo "New SOA serial: $N_SERIAL" -echo -n "$N_SERIAL" > modules/dgn-dns/serial.nix - -@colmena@/bin/colmena apply --on @dns