mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-13 20:30:02 +00:00
Code Activity

nix-daemon: use system NIX_SSL_CERT_FILE

Browse source 
Otherwise the daemon wouldn't honor extra certificates from the
security.pki options.
This commit is contained in:
Daiderd Jordan 2019-01-16 22:47:19 +01:00
parent 655b66975f
commit 629fa53498
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/services/nix-daemon.nix
View file

@ -60,7 +60,7 @@ in
serviceConfig.EnvironmentVariables = mkMerge [
config.nix.envVars
{ NIX_SSL_CERT_FILE = mkDefault "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
{ NIX_SSL_CERT_FILE = mkDefault config.environment.variables.NIX_SSL_CERT_FILE;
TMPDIR = mkIf (cfg.tempDir != null) cfg.tempDir;
}
];

7
tests/services-nix-daemon.nix
View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }:
let
cacert = pkgs.runCommand "cacert-0.0.0" {} "mkdir -p $out";
nix = pkgs.runCommand "nix-0.0.0" { version = "1.11.6"; } "mkdir -p $out";
in
@ -8,6 +9,8 @@ in
services.nix-daemon.enable = true;
nix.package = nix;
environment.variables.NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-certificates.crt";
test = ''
echo checking nix-daemon service in /Library/LaunchDaemons >&2
grep "<string>org.nixos.nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
@ -15,6 +18,10 @@ in
grep "<key>KeepAlive</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
! grep "<key>Sockets</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
echo checking NIX_SSL_CERT_FILE in nix-daemon service >&2
grep "<key>NIX_SSL_CERT_FILE</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
grep "<string>${cacert}/etc/ssl/certs/ca-certificates.crt</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
echo checking nix-daemon reload in /activate >&2
grep "pkill -HUP nix-daemon" ${config.out}/activate