diff options
| author | Alejandro Soto <alejandro@34project.org> | 2025-12-23 07:18:26 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2025-12-23 07:18:34 -0600 |
| commit | a231446d4cf4d9d033727a1abee332aa0bfe4d1e (patch) | |
| tree | 1ed464f8c32fad44c5dc0671dd1f456e25939ab4 | |
| parent | 517b878115c4a720b37a9adac89c7b1d593f0497 (diff) | |
tree-wide: 25.11 updates
| -rw-r--r-- | pki/ca.nix | 6 | ||||
| -rw-r--r-- | sys/jobs/pki-expiry/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -76,7 +76,7 @@ with lib; let config = { fingerprint = { - sha1-lower = readFile (pkgs.runCommandNoCCLocal "cert-${config.path}-fprint-sha1-lower" {} '' + sha1-lower = readFile (pkgs.runCommandLocal "cert-${config.path}-fprint-sha1-lower" {} '' ${openssl} x509 -in ${config.cert} -noout -sha1 -fingerprint \ | sed 's/^.*=//' \ | tr -d $':\n' \ @@ -84,7 +84,7 @@ with lib; let >>$out ''); - sha256-bytes-upper = readFile (pkgs.runCommandNoCCLocal "cert-${config.path}-fprint-sha256-bytes-upper" {} '' + sha256-bytes-upper = readFile (pkgs.runCommandLocal "cert-${config.path}-fprint-sha256-bytes-upper" {} '' ${openssl} x509 -in ${config.cert} -noout -sha256 -fingerprint \ | sed 's/^.*=//' \ | tr -d $'\n' \ @@ -105,7 +105,7 @@ with lib; let path = optionalString (config.issuer != null) (cfg.${config.issuer}.path + ".") + name; } // optionalAttrs (leafOf != null) { - commonName = readFile (pkgs.runCommandNoCCLocal "cert-${config.path}-common-name" {} '' + commonName = readFile (pkgs.runCommandLocal "cert-${config.path}-common-name" {} '' ${openssl} x509 -in ${config.cert} -noout -subject -nameopt multiline \ | grep commonName \ | sed 's/^.*=\s*//' \ diff --git a/sys/jobs/pki-expiry/default.nix b/sys/jobs/pki-expiry/default.nix index 553cdc8..d0d551f 100644 --- a/sys/jobs/pki-expiry/default.nix +++ b/sys/jobs/pki-expiry/default.nix @@ -29,7 +29,7 @@ in { (path: leaf: "ln -s ${leaf.cert} $out/cert/${path}") (filterAttrs (_: object: ! object ? leaves) pki.byPath); - pkiPublic = pkgs.runCommandNoCCLocal "pki-public" {} (concatLines ([mkdir] ++ cas ++ crls ++ certs)); + pkiPublic = pkgs.runCommandLocal "pki-public" {} (concatLines ([mkdir] ++ cas ++ crls ++ certs)); in "${pkiPublic}"; serviceConfig = { |