diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-24 09:46:28 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-24 09:46:28 +0200 |
| commit | b43f47f0b30618e810c7c2c2b186acdbeaed73d6 (patch) | |
| tree | 16441373bc51cfc4b6d5ee475703e39e1f8eb2f5 /tv | |
| parent | af206b48225abdaa6596d4974bfaf112c5fff5ab (diff) | |
| parent | 08c7671fc51270e582e16cbe49aa896f8bff7685 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/default.nix | 10 | ||||
| -rw-r--r-- | tv/2configs/git.nix | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 475c17f2f..39d0c4f6b 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; 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"; @@ -112,6 +112,14 @@ with import <stockholm/lib>; }; } + (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; diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 21d365381..d937be2c4 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -34,9 +34,14 @@ let load-env = {}; make-snapshot = {}; much = {}; + netcup = { + cgit.desc = "netcup command line interface"; + }; newsbot-js = {}; nixpkgs = {}; - populate.desc = "source code installer"; + populate = { + cgit.desc = "source code installer"; + }; push = {}; regfish = {}; soundcloud = { |