summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2023-08-01 14:06:03 +0200
committertv <tv@krebsco.de>2023-08-01 14:06:03 +0200
commit85816b60c2002ea3ea68e51523b9fc2490f0a8e5 (patch)
treea327e03e32744d070652763684e03cd778f26a45
parentf091cd5e03b5abed95c68c80a4df8af2dbcabedc (diff)
zones: import misplaced options from ssh
-rw-r--r--krebs/3modules/ssh.nix23
-rw-r--r--krebs/3modules/zones.nix16
2 files changed, 16 insertions, 23 deletions
diff --git a/krebs/3modules/ssh.nix b/krebs/3modules/ssh.nix
index 58f3a3c10..aba825c29 100644
--- a/krebs/3modules/ssh.nix
+++ b/krebs/3modules/ssh.nix
@@ -4,32 +4,9 @@ let
cfg = config.krebs;
out = {
- options.krebs = api;
config = lib.mkIf cfg.enable imp;
};
- api = {
- zone-head-config = mkOption {
- type = with types; attrsOf str;
- description = ''
- The zone configuration head which is being used to create the
- zone files. The string for each key is pre-pended to the zone file.
- '';
- # TODO: configure the default somewhere else,
- # maybe use krebs.dns.providers
- default = {
-
- # github.io -> 192.30.252.154
- "krebsco.de" = ''
- $TTL 86400
- @ IN SOA dns19.ovh.net. tech.ovh.net. (2015052000 86400 3600 3600000 86400)
- IN NS ns19.ovh.net.
- IN NS dns19.ovh.net.
- '';
- };
- };
- };
-
imp = lib.mkMerge [
{
services.openssh.hostKeys =
diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
index 7771d3b51..a7bd867f5 100644
--- a/krebs/3modules/zones.nix
+++ b/krebs/3modules/zones.nix
@@ -1,6 +1,22 @@
{ config, pkgs, lib, ... }:
with lib; {
+ options.krebs.zone-head-config = mkOption {
+ type = lib.types.attrsOf lib.types.str;
+ description = ''
+ The zone configuration head which is being used to create the
+ zone files. The string for each key is pre-pended to the zone file.
+ '';
+ default = {
+ "krebsco.de" = /* bindzone */ ''
+ $TTL 86400
+ @ IN SOA dns19.ovh.net. tech.ovh.net. (2015052000 86400 3600 3600000 86400)
+ @ IN NS ns19.ovh.net.
+ @ IN NS dns19.ovh.net.
+ '';
+ };
+ };
+
config = {
environment.etc =
mapAttrs'