aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2023-10-12 00:50:39 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2023-10-12 00:55:02 +0200
commitd006558dead086db86daa9e8fa51e95ad8dc59cf (patch)
treeb5edf4712185521b44dff6ffe036d7df524da336
parent736621e5847b885e4913f170a343eaf66433728a (diff)
downloadNix-d006558dead086db86daa9e8fa51e95ad8dc59cf.tar.gz
Nix-d006558dead086db86daa9e8fa51e95ad8dc59cf.tar.zst
Nix-d006558dead086db86daa9e8fa51e95ad8dc59cf.zip
Add contact group for Raito secondary DNS
-rw-r--r--deploy/flake.lock12
-rw-r--r--flake.lock4
-rw-r--r--flakes/flake.lock2
-rw-r--r--systems/eldiron/dns.nix6
4 files changed, 15 insertions, 9 deletions
diff --git a/deploy/flake.lock b/deploy/flake.lock
index c612aef..e499dc0 100644
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2783,7 +2783,7 @@
2783 }, 2783 },
2784 "locked": { 2784 "locked": {
2785 "lastModified": 1, 2785 "lastModified": 1,
2786 "narHash": "sha256-YmxnhQgbNWYxJKGgLz0x2EDmbp/1aOVyO/b+rS2zP0w=", 2786 "narHash": "sha256-8hruoAYeX7Oczb6tu7lDDOZKFbAdHp6I7mC+K1C4itw=",
2787 "path": "../flakes", 2787 "path": "../flakes",
2788 "type": "path" 2788 "type": "path"
2789 }, 2789 },
@@ -3903,7 +3903,7 @@
3903 }, 3903 },
3904 "locked": { 3904 "locked": {
3905 "lastModified": 1, 3905 "lastModified": 1,
3906 "narHash": "sha256-0V71uNTospNTAWsRuCBmTUtes7ECx9D83d/UOtHOek8=", 3906 "narHash": "sha256-oOl1flplnhPOMDiuQyvwS8iSP2caYyK9heTQPzlCNmo=",
3907 "path": "../systems/eldiron", 3907 "path": "../systems/eldiron",
3908 "type": "path" 3908 "type": "path"
3909 }, 3909 },
@@ -8888,11 +8888,11 @@
8888 "nixpkgs": "nixpkgs_106" 8888 "nixpkgs": "nixpkgs_106"
8889 }, 8889 },
8890 "locked": { 8890 "locked": {
8891 "lastModified": 1697062813, 8891 "lastModified": 1697064736,
8892 "narHash": "sha256-pbS3ZgZzCkbL3XO0DpoqQU4JHOMd980vTPX4seMH+U8=", 8892 "narHash": "sha256-kVSGqn6rmXnalgpVsRTxYsRCTWCa1dJByLJU/WudTEA=",
8893 "ref": "master", 8893 "ref": "master",
8894 "rev": "6f65e826f8baaf08a651366f8e05b58d6a7326ad", 8894 "rev": "2cdb86ed84d3110ec30c9d7869ba011e750d6df8",
8895 "revCount": 701, 8895 "revCount": 702,
8896 "type": "git", 8896 "type": "git",
8897 "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets" 8897 "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets"
8898 }, 8898 },
diff --git a/flake.lock b/flake.lock
index 5647e9e..92e34d8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2664,7 +2664,7 @@
2664 }, 2664 },
2665 "locked": { 2665 "locked": {
2666 "lastModified": 1, 2666 "lastModified": 1,
2667 "narHash": "sha256-YmxnhQgbNWYxJKGgLz0x2EDmbp/1aOVyO/b+rS2zP0w=", 2667 "narHash": "sha256-8hruoAYeX7Oczb6tu7lDDOZKFbAdHp6I7mC+K1C4itw=",
2668 "path": "./flakes", 2668 "path": "./flakes",
2669 "type": "path" 2669 "type": "path"
2670 }, 2670 },
@@ -3919,7 +3919,7 @@
3919 }, 3919 },
3920 "locked": { 3920 "locked": {
3921 "lastModified": 1, 3921 "lastModified": 1,
3922 "narHash": "sha256-0V71uNTospNTAWsRuCBmTUtes7ECx9D83d/UOtHOek8=", 3922 "narHash": "sha256-oOl1flplnhPOMDiuQyvwS8iSP2caYyK9heTQPzlCNmo=",
3923 "path": "../systems/eldiron", 3923 "path": "../systems/eldiron",
3924 "type": "path" 3924 "type": "path"
3925 }, 3925 },
diff --git a/flakes/flake.lock b/flakes/flake.lock
index 938fbf6..26f5d4a 100644
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3824,7 +3824,7 @@
3824 }, 3824 },
3825 "locked": { 3825 "locked": {
3826 "lastModified": 1, 3826 "lastModified": 1,
3827 "narHash": "sha256-0V71uNTospNTAWsRuCBmTUtes7ECx9D83d/UOtHOek8=", 3827 "narHash": "sha256-oOl1flplnhPOMDiuQyvwS8iSP2caYyK9heTQPzlCNmo=",
3828 "path": "../systems/eldiron", 3828 "path": "../systems/eldiron",
3829 "type": "path" 3829 "type": "path"
3830 }, 3830 },
diff --git a/systems/eldiron/dns.nix b/systems/eldiron/dns.nix
index 7645b69..857b233 100644
--- a/systems/eldiron/dns.nix
+++ b/systems/eldiron/dns.nix
@@ -303,6 +303,10 @@ in
303 install -dm755 -o named /var/lib/named/dnssec_keys 303 install -dm755 -o named /var/lib/named/dnssec_keys
304 ''); 304 '');
305 myServices.monitoring.fromMasterActivatedPlugins = [ "dns" ]; 305 myServices.monitoring.fromMasterActivatedPlugins = [ "dns" ];
306 myServices.monitoring.fromMasterObjects.contactgroup.dns-raito = {
307 alias = "Secondary DNS Raito";
308 members = "immae";
309 };
306 myServices.monitoring.fromMasterObjects.service = lib.mkMerge (lib.mapAttrsToList (name: z: 310 myServices.monitoring.fromMasterObjects.service = lib.mkMerge (lib.mapAttrsToList (name: z:
307 lib.optional (builtins.elem "immae" z.ns) { 311 lib.optional (builtins.elem "immae" z.ns) {
308 service_description = "eldiron dns is active and authoritative for ${name}"; 312 service_description = "eldiron dns is active and authoritative for ${name}";
@@ -319,6 +323,7 @@ in
319 host_name = config.hostEnv.fqdn; 323 host_name = config.hostEnv.fqdn;
320 use = "dns-service"; 324 use = "dns-service";
321 check_command = ["check_external_dns" "kurisu.dual.lahfa.xyz" name "-A"]; 325 check_command = ["check_external_dns" "kurisu.dual.lahfa.xyz" name "-A"];
326 contact_groups = "dns-raito";
322 327
323 servicegroups = "webstatus-dns"; 328 servicegroups = "webstatus-dns";
324 _webstatus_name = "${name} (Secondary DNS Raito)"; 329 _webstatus_name = "${name} (Secondary DNS Raito)";
@@ -328,6 +333,7 @@ in
328 host_name = config.hostEnv.fqdn; 333 host_name = config.hostEnv.fqdn;
329 use = "dns-service"; 334 use = "dns-service";
330 check_command = ["check_dns_soa" "kurisu.dual.lahfa.xyz" name config.hostEnv.fqdn]; 335 check_command = ["check_dns_soa" "kurisu.dual.lahfa.xyz" name config.hostEnv.fqdn];
336 contact_groups = "dns-raito";
331 337
332 servicegroups = "webstatus-dns"; 338 servicegroups = "webstatus-dns";
333 _webstatus_name = "${name} (Secondary DNS Raito up to date)"; 339 _webstatus_name = "${name} (Secondary DNS Raito up to date)";