From 7245b7203ed59a9398b4875aa998da826f0fdfa7 Mon Sep 17 00:00:00 2001
From: Nguyễn Gia Phong <cnx@loang.net>
Date: Tue, 27 Jun 2023 00:37:11 +0900
Subject: Clean up legacy config

---
 dns.nix  |  9 ---------
 push.nix | 16 +++++-----------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/dns.nix b/dns.nix
index 48c5395..78c4d7d 100644
--- a/dns.nix
+++ b/dns.nix
@@ -61,13 +61,6 @@ in {
           any: info
 
       acl:
-        - id: lego
-          address: 127.0.0.1
-          address: ::1
-          key: lego
-          action: update
-          update-type: TXT
-          update-owner: key
         - id: secondary
           address: 204.87.183.53
           address: 2607:7c80:54:6::53
@@ -92,7 +85,6 @@ in {
           acl: secondary
         - domain: loang.net
           notify: secondary
-          acl: lego
           acl: secondary
         - domain: sinyx.indy
           file: ${sinyxIndyZone}
@@ -106,7 +98,6 @@ in {
           acl: xarvos
     '';
     keyFiles = [
-      "/var/lib/knot/keys/update/lego"
       "/var/lib/knot/keys/update/xrvs.net"
     ];
   };
diff --git a/push.nix b/push.nix
index a6111c0..401f843 100644
--- a/push.nix
+++ b/push.nix
@@ -20,17 +20,6 @@
 let domain = "tin.${config.networking.domain}";
 in {
   services = {
-    ntfy-sh = {
-      enable = true;
-      settings = {
-        base-url = "https://${domain}";
-        # Cannot write to log for some reason,
-        # TODO: Ask on their forum about that
-        # log-level = "info";
-        # log-file = "/var/log/ntfy-sh/ntfy.log";
-      };
-    };
-
     nginx.virtualHosts."${domain}" = {
       enableACME = true;
       forceSSL = true;
@@ -39,5 +28,10 @@ in {
         proxyWebsockets = true;
       };
     };
+
+    ntfy-sh = {
+      enable = true;
+      settings.base-url = "https://${domain}";
+    };
   };
 }
-- 
cgit 1.4.1