summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-27 19:43:59 +0200
committerlassulus <lass@aidsballs.de>2016-10-27 19:43:59 +0200
commitb4b03d356174a34806d6029b844c59aca9d3840e (patch)
treea3ff4ed4350e07bc91605018aeb20e80a54a43d8 /tv/2configs
parent98659a68c7c40bee92e851afcf5a9bebeb3e2a06 (diff)
parentc1a423b6857f2140a9c9b425f9d5f81a679537bb (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/default.nix15
1 files changed, 8 insertions, 7 deletions
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 <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";
- };
- })
+ {
+ 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;