From 3abb88edf4bf04b60212bb4c94aadb52b4c9c9ef Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 27 Oct 2016 22:04:21 +0200 Subject: add krebs.tinc.*.hostsArchive --- krebs/3modules/retiolum.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'krebs/3modules') diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix index fddaed9e3..ed99cc551 100644 --- a/krebs/3modules/retiolum.nix +++ b/krebs/3modules/retiolum.nix @@ -79,6 +79,15 @@ let ''; }; + hostsArchive = mkOption { + type = types.package; + default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} '' + ${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts + ${pkgs.gnutar}/bin/tar -hcjf $out hosts + ''; + readOnly = true; + }; + hostsPackage = mkOption { type = types.package; default = pkgs.stdenv.mkDerivation { -- cgit v1.2.3 From 15121c8ae141ae0c2b81bbf69b1a2eac4e41c2f2 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 22:22:23 +0100 Subject: ni: init --- krebs/3modules/tv/default.nix | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'krebs/3modules') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 0e7535e6c..eaec64d50 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -218,6 +218,49 @@ with import ; ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1vJsAddvxMA84u9iJEOrIkKn7pQiemMbfW5cfK1d7g root@mu"; }; + ni = { + extraZones = { + "krebsco.de" = '' + ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} + ''; + }; + nets = { + internet = { + ip4.addr = "188.68.36.196"; + aliases = [ + "ni.i" + ]; + ssh.port = 11423; + }; + retiolum = { + via = config.krebs.hosts.ni.nets.internet; + ip4.addr = "10.243.113.223"; + ip6.addr = "42:4522:25f8:36bb:8ccb:0150:231a:2af4"; + aliases = [ + "ni.r" + "ni.retiolum" + "cgit.ni.r" + "cgit.ni.retiolum" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEA7NHuW8eLVhpBfL70WwcSGVmv4dijKLJs5cH/BmqK8zN2lpiLKt12 + bhaE1YEhGoGma7Kef1Fa0V9xUkJy6C1+sVlfWp/LeY8VRSX5E3u36TEl6kl/4zu6 + Ea/44BoGUSOC9ImxVEX51czA10PFjUSrGFyK0oaRlKNsTwwpNiBOY7/6i74bhn59 + OIsySRUBd2QPjYhJkiuc7gltVfwt6wteZh8R4w2rluVGYLQPsmN/XEWgJbhzI4im + W+3/bdewHVF1soZWtdocPLeXTn5HETX5g8p2V3bwYL37oIwkCcYxOeQtT7W+lNJ2 + NvIiVh4Phojl4dBUgUQGT0NApMnsaG/4LJpSC4AGiqbsznBdSPhepob7zJggPnWY + nfAs+YrUUZp1wovhSgWfYTRglRuyYvWkoGbq411H1efawyZ0gcMr+HQlSn2keQOv + lbcvdgOAxQiEcPVixPq3mTeKaSxWyIJGFceuqtnILGifRNvViX0uo9g5rLQ41PrJ + 9F3azz3gD2Uh73j5pvLU72cge7p1a7epPYWTJYf8oc5JcI3nYTKpSqH8IYaWUjv9 + q0NwOYFDhYtUcTwdbUNl/tUWKyBcovIe7f40723pHSijiPV2WDZC2M/mOc3dvWKF + Mf00uin+7uMuKtnG6+1z5nKb/AWrqN1RZu0rnG/IkZPKwa19HYsYcOkCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGDdcKwFm6udU0/x6XGGb87k9py0VlrxF54HeYu9Izb"; + }; nomic = { cores = 2; nets = { -- cgit v1.2.3 From 916487575ad9da6cdefa41e3ee4e8989ef2080a0 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 22:28:00 +0100 Subject: krebs/3/${username}: drop lib --- krebs/3modules/default.nix | 10 +++++----- krebs/3modules/lass/default.nix | 2 +- krebs/3modules/makefu/default.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index ec85464df..e6ad449fa 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -90,11 +90,11 @@ let }; imp = lib.mkMerge [ - { krebs = import ./lass { inherit config lib; }; } - { krebs = import ./makefu { inherit config lib; }; } - { krebs = import ./mv { inherit config lib; }; } - { krebs = import ./shared { inherit config lib; }; } - { krebs = import ./tv { inherit config lib; }; } + { krebs = import ./lass { inherit config; }; } + { krebs = import ./makefu { inherit config; }; } + { krebs = import ./mv { inherit config; }; } + { krebs = import ./shared { inherit config; }; } + { krebs = import ./tv { inherit config; }; } { krebs.dns.providers = { "krebsco.de" = "zones"; diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index ad1221e8e..5af1e37cd 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: with import ; diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 7317e0b60..ff187b878 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: with import ; -- cgit v1.2.3 From 941fb77ae550beda1af873536f80ac2180a6afa9 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 23:00:04 +0100 Subject: krebs.tinc.retiolum: update connectTo default --- krebs/3modules/retiolum.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix index ed99cc551..0a3d7ed2f 100644 --- a/krebs/3modules/retiolum.nix +++ b/krebs/3modules/retiolum.nix @@ -134,7 +134,11 @@ let connectTo = mkOption { type = types.listOf types.str; - default = [ "fastpoke" "cd" "prism" "gum" ]; + ${if tinc.config.netname == "retiolum" then "default" else null} = [ + "gum" + "ni" + "prism" + ]; description = '' The list of hosts in the network which the client will try to connect to. These hosts should have an 'Address' configured which points to a -- cgit v1.2.3 From 8ba54ab453f6fd0805214eeef6f60fa470760fca Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 23:15:33 +0100 Subject: pkgs.*.src.url: s/cd/ni/g --- krebs/3modules/os-release.nix | 2 +- krebs/3modules/tv/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/os-release.nix b/krebs/3modules/os-release.nix index 50cf72ef9..0779feede 100644 --- a/krebs/3modules/os-release.nix +++ b/krebs/3modules/os-release.nix @@ -13,7 +13,7 @@ let version-id = "${stockholm-version-id}/${nixos-version-id}"; pretty-name = "${stockholm-pretty-name} / ${nixos-pretty-name}"; - home-url = http://cgit.cd.krebsco.de/stockholm; + home-url = http://cgit.ni.krebsco.de/stockholm; in { # http://0pointer.de/public/systemd-man/os-release.html diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index eaec64d50..c63810773 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -222,6 +222,7 @@ with import ; extraZones = { "krebsco.de" = '' ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} + cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} ''; }; nets = { -- cgit v1.2.3 From 2adac450ac1f613acd81069895448623a4c8937b Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 23:17:36 +0100 Subject: ni aliases += cgit.ni.i --- krebs/3modules/tv/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index c63810773..ca8e577d8 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -229,6 +229,7 @@ with import ; internet = { ip4.addr = "188.68.36.196"; aliases = [ + "cgit.ni.i" "ni.i" ]; ssh.port = 11423; -- cgit v1.2.3 From f458fd8be96e39b2ba6cf15f0ee48b38f294044c Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 23:50:34 +0100 Subject: cd: drop stuff now done by ni --- krebs/3modules/tv/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index ca8e577d8..8e266e1b3 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -78,11 +78,7 @@ with import ; extraZones = { # TODO generate krebsco.de zone from nets and don't use extraZones at all "krebsco.de" = '' - krebsco.de. 60 IN MX 5 mx23 - mx23 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr} cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr} - cgit 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr} - cgit.cd 60 IN A ${config.krebs.hosts.cd.nets.internet.ip4.addr} ''; }; nets = { @@ -90,11 +86,7 @@ with import ; ip4.addr = "45.62.237.203"; aliases = [ "cd.i" - "cd.internet" "cd.krebsco.de" - "cgit.cd.krebsco.de" - "cd.viljetic.de" - "cgit.cd.viljetic.de" ]; ssh.port = 11423; }; @@ -221,7 +213,9 @@ with import ; ni = { extraZones = { "krebsco.de" = '' + krebsco.de. 60 IN MX 5 ni ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} + cgit 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} cgit.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} ''; }; -- cgit v1.2.3 From ae73660522fb8a02a86eaa7124285a3aaa3cbb14 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 11 Nov 2016 01:50:59 +0100 Subject: krebs: no extraHosts w/o aliases #2 --- krebs/3modules/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index e6ad449fa..82ede952d 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -130,7 +130,9 @@ let shorts = let s = ".${cfg.search-domain}"; in map (removeSuffix s) (filter (hasSuffix s) longs); in - map (addr: "${addr} ${toString aliases}") net.addrs + optionals + (aliases != []) + (map (addr: "${addr} ${toString aliases}") net.addrs) ) (filterAttrs (name: host: host.aliases != []) host.nets) ) cfg.hosts )); -- cgit v1.2.3