Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

treewide: use NIX_SSL_CERT_FILE instead of pkgs.cacert #1174

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

treewide: use NIX_SSL_CERT_FILE instead of pkgs.cacert #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/examples/hydra.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
let
environment = lib.concatStringsSep " "
[ "NIX_REMOTE=daemon"
"NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
"NIX_SSL_CERT_FILE=${config.environment.variables.NIX_SSL_CERT_FILE}"
];
in

Expand Down
2 changes: 1 addition & 1 deletion modules/examples/lnl.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# launchd.user.agents.fetch-nixpkgs-updates = {
# command = "/usr/bin/sandbox-exec -f ${config.security.sandbox.profiles.fetch-nixpkgs-updates.profile} ${pkgs.git}/bin/git -C ${toString ~/Code/nixos/nixpkgs} fetch origin master";
# environment.HOME = "";
# environment.NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
# environment = { inherit (config.environment.variables) NIX_SSL_CERT_FILE; };
# serviceConfig.KeepAlive = false;
# serviceConfig.ProcessType = "Background";
# serviceConfig.StartInterval = 360;
Expand Down
2 changes: 1 addition & 1 deletion modules/services/cachix-agent.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ in {
path = [ config.nix.package pkgs.coreutils config.environment.systemPath ];

environment = {
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
USER = "root";
};

Expand Down
2 changes: 1 addition & 1 deletion modules/services/gitlab-runner.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ in
launchd.daemons.gitlab-runner = {
environment = { #config.networking.proxy.envVars // {
HOME = "${config.users.users.gitlab-runner.home}";
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
} // (if config.nix.useDaemon then { NIX_REMOTE = "daemon"; } else {});
path = with pkgs; [
bash
Expand Down
2 changes: 1 addition & 1 deletion modules/services/hercules-ci-agent/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ in

path = [ config.nix.package config.environment.systemPath ];
environment = {
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
};

serviceConfig.KeepAlive = true;
Expand Down
2 changes: 1 addition & 1 deletion modules/services/ofborg/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ in
path = [ config.nix.package pkgs.bash pkgs.coreutils pkgs.curl pkgs.git ];
environment =
{ RUST_BACKTRACE = "1";
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
};

serviceConfig.KeepAlive = true;
Expand Down