From d999dc6d2536cb378e057a55759457fdfb5db7a4 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 24 Oct 2016 14:38:54 +0200 Subject: tv: DRY up ca-bundle defs --- tv/2configs/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 39d0c4f6b..0854e53c2 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -112,13 +112,14 @@ with import ; }; } - (let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in { - environment.variables = { - CURL_CA_BUNDLE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - }; - }) + { + environment.variables = + flip genAttrs (_: "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt") [ + "CURL_CA_BUNDLE" + "GIT_SSL_CAINFO" + "SSL_CERT_FILE" + ]; + } { services.cron.enable = false; -- cgit v1.2.3 From b364aa96c9b162fc6e87dbfdb9a643551a285f7f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 27 Oct 2016 19:44:53 +0200 Subject: tv nixpkgs: e4fb65a -> 0195ab8 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 0854e53c2..1114ac1a5 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9"; + ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; -- cgit v1.2.3 From 102d2515bcf4939f064ed791d09a2bf7aab2ff32 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 3 Nov 2016 15:25:56 +0100 Subject: tv nixpkgs: 0195ab8 -> 238c7e0 --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 1114ac1a5..514d313c1 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731"; + ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; -- cgit v1.2.3 From 174c7ab9bd60d948c494d42621cdc85fde8ac318 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 4 Nov 2016 23:40:43 +0100 Subject: tv git: add loldns --- tv/2configs/git.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tv/2configs') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index d937be2c4..eb13e4282 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -32,6 +32,9 @@ let get = {}; hack = {}; load-env = {}; + loldns = { + cgit.desc = "toy DNS server"; + }; make-snapshot = {}; much = {}; netcup = { -- cgit v1.2.3 From 9ae96685ec9ccadb84a5a7034d1fc627c95d94ec Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 20:50:59 +0100 Subject: tv nixpkgs: 238c7e0 -> 1e1112e --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 514d313c1..dbf311479 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import ; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "238c7e0dbf73d7f330689cb6ec4b1218526cee4e"; + ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; -- 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 --- tv/2configs/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index eb13e4282..b38ef00f9 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -84,7 +84,7 @@ let make-public-repo = name: { cgit ? {}, ... }: { inherit cgit name; public = true; - hooks = optionalAttrs (config.krebs.build.host.name == "cd") { + hooks = optionalAttrs (config.krebs.build.host.name == "ni") { post-receive = pkgs.git-hooks.irc-announce { # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; -- cgit v1.2.3 From a125dad5a88a5d30acb061dad36be07aadf3d28a Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2016 23:54:09 +0100 Subject: tv retiolum: s/cd|echelon/ni/ --- tv/2configs/retiolum.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix index ad1116d4f..a914dad43 100644 --- a/tv/2configs/retiolum.nix +++ b/tv/2configs/retiolum.nix @@ -7,9 +7,8 @@ with import ; enable = true; connectTo = filter (ne config.krebs.build.host.name) [ "gum" + "ni" "prism" - "echelon" - "cd" ]; tincPackage = pkgs.tinc_pre; }; -- cgit v1.2.3 From b837dec290e54f532cd5539c93a663ba11f68c54 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 11 Nov 2016 08:47:46 +0100 Subject: cd: drop stuff now done by ni #2 --- tv/2configs/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv/2configs') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index b38ef00f9..b6724f40e 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -89,7 +89,7 @@ let # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; channel = "#retiolum"; - server = "cd.retiolum"; + server = "ni.r"; verbose = true; }; }; -- cgit v1.2.3