From be312a1b1e371da31e79fc3d15474ded5bc94c70 Mon Sep 17 00:00:00 2001 From: Alexander Gaus Date: Tue, 8 Nov 2022 22:04:39 +0100 Subject: external: add rtunreal user and hosts --- krebs/3modules/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 01436d352..7af6b13d9 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -105,6 +105,7 @@ let { krebs = import ./external/kmein.nix { inherit config; }; } { krebs = import ./external/mic92.nix { inherit config; }; } { krebs = import ./external/palo.nix { inherit config; }; } + { krebs = import ./external/rtunreal.nix { inherit config; }; } { krebs = import ./jeschli { inherit config; }; } { krebs = import ./krebs { inherit config; }; } { krebs = import ./lass { inherit config; }; } -- cgit v1.2.3 From 606f88e4f0a8c257f9e6be94ca8469da04b381cc Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 22 Nov 2022 20:15:44 +0100 Subject: kartei: init --- krebs/3modules/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 7af6b13d9..70fc05813 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -6,6 +6,7 @@ let out = { imports = [ + ../../kartei ./acl.nix ./airdcpp.nix ./announce-activation.nix @@ -100,17 +101,6 @@ let }; imp = lib.mkMerge [ - { krebs = import ./external { inherit config; }; } - { krebs = import ./external/dbalan.nix { inherit config; }; } - { krebs = import ./external/kmein.nix { inherit config; }; } - { krebs = import ./external/mic92.nix { inherit config; }; } - { krebs = import ./external/palo.nix { inherit config; }; } - { krebs = import ./external/rtunreal.nix { inherit config; }; } - { krebs = import ./jeschli { inherit config; }; } - { krebs = import ./krebs { inherit config; }; } - { krebs = import ./lass { inherit config; }; } - { krebs = import ./makefu { inherit config; }; } - { krebs = import ./tv { inherit config; }; } { krebs.dns.providers = { "krebsco.de" = "zones"; -- cgit v1.2.3 From c084136980f9a29f5b42b32731b6dbe22b3366dc Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 23 Nov 2022 16:37:32 +0100 Subject: krebs: extract users into separate module --- krebs/3modules/default.nix | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 70fc05813..6c76b48e3 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -56,6 +56,7 @@ let ./tinc_graphs.nix ./upstream ./urlwatch.nix + ./users.nix ./xresources.nix ./zones.nix ]; @@ -66,10 +67,6 @@ let api = { enable = mkEnableOption "krebs"; - users = mkOption { - type = with types; attrsOf user; - }; - sitemap = mkOption { default = {}; type = types.attrsOf types.sitemap.entry; @@ -112,18 +109,6 @@ let krebs.dns.search-domain = mkDefault "r"; - krebs.users = { - krebs = { - home = "/krebs"; - mail = "spam@krebsco.de"; - }; - root = { - home = "/root"; - pubkey = config.krebs.build.host.ssh.pubkey; - uid = 0; - }; - }; - services.openssh.hostKeys = let inherit (config.krebs.build.host.ssh) privkey; in mkIf (privkey != null) [privkey]; -- cgit v1.2.3 From 6af959ad44a85b1f89ce347480bf18a46a039571 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 23 Nov 2022 16:43:02 +0100 Subject: krebs: extract sitemap into separate module --- krebs/3modules/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 6c76b48e3..a8cf6c767 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -49,6 +49,7 @@ let ./secret.nix ./setuid.nix ./shadow.nix + ./sitemap.nix ./ssl.nix ./sync-containers.nix ./systemd.nix @@ -67,11 +68,6 @@ let api = { enable = mkEnableOption "krebs"; - sitemap = mkOption { - default = {}; - type = types.attrsOf types.sitemap.entry; - }; - zone-head-config = mkOption { type = with types; attrsOf str; description = '' -- cgit v1.2.3 From a278a6503bf1c8de8e233f72faa442baaab29ab0 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 23 Nov 2022 16:49:41 +0100 Subject: krebs dns: move config to dns module --- krebs/3modules/default.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index a8cf6c767..e8f5d1611 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -95,16 +95,6 @@ let imp = lib.mkMerge [ { - krebs.dns.providers = { - "krebsco.de" = "zones"; - shack = "hosts"; - i = "hosts"; - r = "hosts"; - w = "hosts"; - }; - - krebs.dns.search-domain = mkDefault "r"; - services.openssh.hostKeys = let inherit (config.krebs.build.host.ssh) privkey; in mkIf (privkey != null) [privkey]; -- cgit v1.2.3 From 4cb2771732108d16728021e17099dfda6e21f5fe Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Dec 2022 11:48:29 +0100 Subject: modules ergo: RIP --- krebs/3modules/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index e8f5d1611..0ac8cb743 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -20,7 +20,6 @@ let ./ci ./current.nix ./dns.nix - ./ergo.nix ./exim-retiolum.nix ./exim-smarthost.nix ./exim.nix -- cgit v1.2.3 From 69ddda1380d3d533ee24d8ec5d97e59e2b82b305 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 9 Dec 2022 15:50:25 +0100 Subject: krebs.pages: init --- krebs/3modules/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 0ac8cb743..b92190b5b 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -34,6 +34,7 @@ let ./iptables.nix ./kapacitor.nix ./konsens.nix + ./krebs-pages.nix ./monit.nix ./nixpkgs.nix ./on-failure.nix -- cgit v1.2.3 From 0d19e5948545eeab67ba3cf052e396137e9cafd1 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 9 Dec 2022 14:52:14 +0100 Subject: krebsco.de: point apex to ni --- krebs/3modules/default.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index b92190b5b..6babac72e 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -84,10 +84,6 @@ let @ IN SOA dns19.ovh.net. tech.ovh.net. (2015052000 86400 3600 3600000 86400) IN NS ns19.ovh.net. IN NS dns19.ovh.net. - IN A 185.199.108.153 - IN A 185.199.109.153 - IN A 185.199.110.153 - IN A 185.199.111.153 ''; }; }; -- cgit v1.2.3