From 491c088731022463978e595956427e72db6306a9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Jun 2014 13:03:44 +0200 Subject: Revert "Merge #2692: Use pam_env to properly setup system-wide env" This reverts commit 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c. --- nixos/modules/security/ca.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'nixos/modules/security/ca.nix') diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 57764dc870f..f159e359f96 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -12,11 +12,9 @@ with lib; } ]; - environment.systemVariables = - { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; - GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; - }; + environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; -- cgit 1.4.1