From 2c74f5a654fa357a4eec8eef9c40ebdbd4456f70 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Oct 2016 18:10:00 +0200 Subject: tv: globally set CURL_CA_BUNDLE, GIT_SSL_CAINFO, SSL_CERT_FILE --- tv/2configs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tv') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 475c17f2f..4b89252f9 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -112,6 +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"; + }; + }) + { services.cron.enable = false; services.nscd.enable = false; -- cgit v1.2.3 From e66a4afdc11db6864ac96815feac4eb797e2c038 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Oct 2016 18:10:31 +0200 Subject: tv git: add netcup --- tv/2configs/git.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 21d365381..7d641dceb 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -34,6 +34,7 @@ let load-env = {}; make-snapshot = {}; much = {}; + netcup.desc = "netcup command line interface"; newsbot-js = {}; nixpkgs = {}; populate.desc = "source code installer"; -- cgit v1.2.3 From 9e6c8a91b23326abd7c26c70e96c9069e79a7938 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Oct 2016 18:15:20 +0200 Subject: tv git: replace misplaced desc attrs --- tv/2configs/git.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tv') diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 7d641dceb..d937be2c4 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -34,10 +34,14 @@ let load-env = {}; make-snapshot = {}; much = {}; - netcup.desc = "netcup command line interface"; + netcup = { + cgit.desc = "netcup command line interface"; + }; newsbot-js = {}; nixpkgs = {}; - populate.desc = "source code installer"; + populate = { + cgit.desc = "source code installer"; + }; push = {}; regfish = {}; soundcloud = { -- cgit v1.2.3 From 6c02b9125dc7025ebad0a15cf4916f812f8f8e49 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Oct 2016 21:33:45 +0200 Subject: tv nixpkgs: cd41bfe -> e4fb65a --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 4b89252f9..39d0c4f6b 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 = "cd41bfeeb1aaa10e4d412f2bd90dc2844a7c5df8"; + ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; -- cgit v1.2.3