From 7f387cb7de3d830e04c046c441fe4684d8c53fab Mon Sep 17 00:00:00 2001 From: kat witch Date: Tue, 27 Apr 2021 19:38:12 +0100 Subject: [PATCH] modules/nixos/katnet: Init --- hosts/athame/nixos/default.nix | 6 ------ hosts/samhain/nixos/default.nix | 6 ------ hosts/yule/nixos/default.nix | 6 ------ modules/nixos/default.nix | 1 + modules/nixos/katnet/default.nix | 13 +++++++++++++ 5 files changed, 14 insertions(+), 18 deletions(-) create mode 100644 modules/nixos/katnet/default.nix diff --git a/hosts/athame/nixos/default.nix b/hosts/athame/nixos/default.nix index 3798d36f..5b61907b 100644 --- a/hosts/athame/nixos/default.nix +++ b/hosts/athame/nixos/default.nix @@ -88,12 +88,6 @@ to = 20000; }]; # asterisk - deploy.tf.dns.records.kittywitch_net_athame = { - tld = "kittywit.ch."; - domain = "${config.networking.hostName}.net"; - aaaa.address = config.hexchen.network.address; - }; - deploy.tf.dns.records.kittywitch_athame_v6 = { tld = "kittywit.ch."; domain = "athame"; diff --git a/hosts/samhain/nixos/default.nix b/hosts/samhain/nixos/default.nix index ea9ccfd9..28a9c7b5 100644 --- a/hosts/samhain/nixos/default.nix +++ b/hosts/samhain/nixos/default.nix @@ -131,12 +131,6 @@ in { listen.endpoints = [ "tcp://0.0.0.0:0" ]; }; - deploy.tf.dns.records.kittywitch_net_samhain = { - tld = "kittywit.ch."; - domain = "${config.networking.hostName}.net"; - aaaa.address = config.hexchen.network.address; - }; - system.stateVersion = "20.09"; } diff --git a/hosts/yule/nixos/default.nix b/hosts/yule/nixos/default.nix index f5f25b10..ff693c63 100644 --- a/hosts/yule/nixos/default.nix +++ b/hosts/yule/nixos/default.nix @@ -33,12 +33,6 @@ listen.endpoints = [ "tcp://0.0.0.0:0" ]; }; - deploy.tf.dns.records.kittywitch_net_yule = { - tld = "kittywit.ch."; - domain = "${config.networking.hostName}.net"; - aaaa.address = config.hexchen.network.address; - }; - system.stateVersion = "20.09"; } diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 964209c1..290677f1 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -4,6 +4,7 @@ let hexchen = (import sources.nix-hexchen) { }; in { imports = [ ./deploy + ./katnet ./tf-glue (sources.pbb-nixfiles + "/modules/nftables") (sources.tf-nix + "/modules/nixos/secrets.nix") diff --git a/modules/nixos/katnet/default.nix b/modules/nixos/katnet/default.nix new file mode 100644 index 00000000..22745a6d --- /dev/null +++ b/modules/nixos/katnet/default.nix @@ -0,0 +1,13 @@ +{ config, hosts, lib, pkgs, ... }: + +with lib; + +{ + config = mkIf config.hexchen.network.enable { + deploy.tf.dns.records."kittywitch_net_${config.networking.hostName}" = { + tld = "kittywit.ch."; + domain = "${config.networking.hostName}.net"; + aaaa.address = config.hexchen.network.address; + }; + }; +}