diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-31 15:48:17 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-31 15:50:51 -0700 |
| commit | 867d2c5c464fd87268f71942beded17d7e1e5b9c (patch) | |
| tree | a2bb6204a333321ec0544fa86d44afee962fa30b /nixos/modules | |
| parent | afa5859716914cce8e3d8b13a6692c100bd96723 (diff) | |
| download | nixpkgs-867d2c5c464fd87268f71942beded17d7e1e5b9c.tar nixpkgs-867d2c5c464fd87268f71942beded17d7e1e5b9c.tar.gz nixpkgs-867d2c5c464fd87268f71942beded17d7e1e5b9c.tar.bz2 nixpkgs-867d2c5c464fd87268f71942beded17d7e1e5b9c.tar.lz nixpkgs-867d2c5c464fd87268f71942beded17d7e1e5b9c.tar.xz nixpkgs-867d2c5c464fd87268f71942beded17d7e1e5b9c.tar.zst nixpkgs-867d2c5c464fd87268f71942beded17d7e1e5b9c.zip | |
openssl: Remove References to OPENSSL_X509_CERT_FILE
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/programs/venus.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/security/ca.nix | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 2b70a795f4f..3b5ae07e82f 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -166,7 +166,7 @@ in script = "exec venus-planet ${configFile}"; serviceConfig.User = "${cfg.user}"; serviceConfig.Group = "${cfg.group}"; - environment.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; startAt = cfg.dates; }; diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 595b9476fa5..dec5a62dcf0 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -67,8 +67,6 @@ in environment.sessionVariables = { SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; # FIXME: unneeded - remove eventually. - OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; - # FIXME: unneeded - remove eventually. GIT_SSL_CAINFO = "/etc/ssl/certs/ca-certificates.crt"; }; |