From cb0cfbaf4a7d27403e4fef891639b00a764834a9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 16 Jul 2024 22:33:27 +0100 Subject: [PATCH] fmt: move the dns into its own folder --- applications/_base.nix | 2 +- applications/{ => dns}/dns.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename applications/{ => dns}/dns.nix (98%) diff --git a/applications/_base.nix b/applications/_base.nix index bd1f017..3224563 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -10,7 +10,7 @@ with lib; let in { imports = [ ./acme.nix - ./dns.nix + ../dns/dns.nix ./nginx.nix ]; diff --git a/applications/dns.nix b/applications/dns/dns.nix similarity index 98% rename from applications/dns.nix rename to applications/dns/dns.nix index 9bb7d48..9503539 100644 --- a/applications/dns.nix +++ b/applications/dns/dns.nix @@ -291,8 +291,8 @@ else "ns2"; in { imports = [ - ./firewall.nix - ../config/dns.nix + ../firewall.nix + ../../config/dns.nix ]; options.services.skynet."${name}" = { @@ -318,7 +318,7 @@ in { records = lib.mkOption { description = "Records, sorted based on therir type"; - type = lib.types.listOf (lib.types.submodule (import ./dns/options-records.nix { + type = lib.types.listOf (lib.types.submodule (import ./options-records.nix { inherit lib; })); }; @@ -357,7 +357,7 @@ in { # secrets required age.secrets.dns_dnskeys = { - file = ../secrets/dns_dnskeys.conf.age; + file = ../../secrets/dns_dnskeys.conf.age; owner = "named"; group = "named"; };