From b0b2ed8fb017beb72d3f6eabd3e80a120e51a5aa Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 12 Aug 2021 06:12:55 +0100
Subject: [PATCH] final fixes for the day

---
 depot/services/mail/default.nix       |  4 +++-
 depot/services/prometheus/default.nix |  8 ++++----
 pkgs/default.nix                      |  2 +-
 pkgs/kat-glauca-dns/default.nix       | 14 --------------
 4 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/kat-glauca-dns/default.nix

diff --git a/depot/services/mail/default.nix b/depot/services/mail/default.nix
index 5c8342e5..b0a22be1 100644
--- a/depot/services/mail/default.nix
+++ b/depot/services/mail/default.nix
@@ -42,7 +42,9 @@ with lib;
     domains = [ "kittywit.ch" "dork.dev" ];
     # Use Let's Encrypt certificates. Note that this needs to set up a stripped
     # down nginx and opens port 80.
-    certificateScheme = 3;
+    certificateScheme = 1;
+    certificateFile = "/var/lib/acme/${config.mailserver.fqdn}/cert.pem";
+    keyFile = "/var/lib/acme/${config.mailserver.fqdn}/key.pem";
 
     # Enable IMAP and POP3
     enableImap = true;
diff --git a/depot/services/prometheus/default.nix b/depot/services/prometheus/default.nix
index 412c1d56..294bc528 100644
--- a/depot/services/prometheus/default.nix
+++ b/depot/services/prometheus/default.nix
@@ -17,12 +17,12 @@ in
     scrapeConfigs = [
       {
         job_name = "boline";
-        static_configs = [{ targets = [ "boline.${config.network.dns.ygg_prefix}.${config.network.dns.domain}:8002" ]; }];
+        static_configs = [{ targets = [ "boline.${config.network.addresses.yggdrasil.prefix}.${config.network.dns.domain}:8002" ]; }];
       }
       {
         job_name = "samhain-vm";
         metrics_path = "/metrics";
-        static_configs = [{ targets = [ "samhain.${config.network.dns.ygg_prefix}.${config.network.dns.domain}:10445" ]; }];
+        static_configs = [{ targets = [ "samhain.${config.network.addresses.yggdrasil.prefix}.${config.network.dns.domain}:10445" ]; }];
       }
     ] ++ mapAttrsToList
       (hostName: prom: {
@@ -30,13 +30,13 @@ in
         metrics_path = "/api/v1/allmetrics";
         honor_labels = true;
         params = { format = [ "prometheus" ]; };
-        static_configs = [{ targets = [ "${hostName}.${config.network.dns.ygg_prefix}.${config.network.dns.domain}:19999" ]; }];
+        static_configs = [{ targets = [ "${hostName}.${config.network.addresses.yggdrasil.prefix}.${config.network.dns.domain}:19999" ]; }];
       })
       nd_configs ++ mapAttrsToList
       (hostName: prom: {
         job_name = hostName;
         static_configs = [{
-          targets = [ "${hostName}.${config.network.dns.ygg_prefix}.${config.network.dns.domain}:${toString prom.port}" ];
+          targets = [ "${hostName}.${config.network.addresses.yggdrasil.prefix}.${config.network.dns.domain}:${toString prom.port}" ];
         }];
       })
       prom_configs;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index e00ce4b3..c3aa26d7 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -80,7 +80,7 @@ let
 
         kat-splash = self.callPackage ./kat-splash { };
 
-        kat-glauca-dns = self.callPackage ./kat-glauca-dns { };
+        kat-website = self.callPackage ./kat-website { };
 
         kat-gpg-status = self.callPackage ./kat-gpg-status { };
 
diff --git a/pkgs/kat-glauca-dns/default.nix b/pkgs/kat-glauca-dns/default.nix
deleted file mode 100644
index 592a11da..00000000
--- a/pkgs/kat-glauca-dns/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, curl, coreutils, writeShellScriptBin }:
-
-writeShellScriptBin "kat-glauca-dns" ''
-  #!/usr/bin/env bash
-  set -eu
-
-  ip4=$(${curl}/bin/curl -s --ipv4 https://dns.glauca.digital/checkip)
-  ip6=$(${curl}/bin/curl -s --ipv6 https://dns.glauca.digital/checkip)
-  source $passFile
-  echo "$ip4, $ip6"
-    ${curl}/bin/curl -u ''${user}:''${pass} --data-urlencode "hostname=''${hostname}" --data-urlencode "myip=''${ip4}" "https://dns.glauca.digital/nic/update"
-  echo ""
-    ${curl}/bin/curl -u ''${user}:''${pass} --data-urlencode "hostname=''${hostname}" --data-urlencode "myip=''${ip6}" "https://dns.glauca.digital/nic/update"
-''