diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-12 02:16:35 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-12 02:16:35 +0200 |
| commit | 9586795ef27ac4d406c10c12f92fc735b5f4ff24 (patch) | |
| tree | 71a7cfba816e7d27c301368686d5ed91453267c9 /nixos/modules/services/misc/taskserver/default.nix | |
| parent | cfb6ce2abed2c96d0f5af268e2d22322f47831ed (diff) | |
| download | nixlib-9586795ef27ac4d406c10c12f92fc735b5f4ff24.tar nixlib-9586795ef27ac4d406c10c12f92fc735b5f4ff24.tar.gz nixlib-9586795ef27ac4d406c10c12f92fc735b5f4ff24.tar.bz2 nixlib-9586795ef27ac4d406c10c12f92fc735b5f4ff24.tar.lz nixlib-9586795ef27ac4d406c10c12f92fc735b5f4ff24.tar.xz nixlib-9586795ef27ac4d406c10c12f92fc735b5f4ff24.tar.zst nixlib-9586795ef27ac4d406c10c12f92fc735b5f4ff24.zip | |
nixos/taskserver: Silence certtool everywhere
We only print the output whenever there is an error, otherwise let's shut it up because it only shows information the user can gather through other means. For example by invoking certtool manually, or by just looking at private key files (the whole blurb it's outputting is in there as well). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules/services/misc/taskserver/default.nix')
| -rw-r--r-- | nixos/modules/services/misc/taskserver/default.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 3a53431939bc..dc73ad26eb6c 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -118,6 +118,8 @@ let mkShellStr = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; + certtool = "${pkgs.gnutls}/bin/certtool"; + nixos-taskserver = pkgs.buildPythonPackage { name = "nixos-taskserver"; namePrefix = ""; @@ -126,8 +128,7 @@ let mkdir -p "$out" cat "${pkgs.substituteAll { src = ./helper-tool.py; - certtool = "${pkgs.gnutls}/bin/certtool"; - inherit taskd; + inherit taskd certtool; inherit (cfg) dataDir user group fqdn; }}" > "$out/main.py" cat > "$out/setup.py" <<EOF @@ -351,14 +352,21 @@ in { serviceConfig.UMask = "0077"; script = '' + silent_certtool() { + if ! output="$("${certtool}" "$@" 2>&1)"; then + echo "GNUTLS certtool invocation failed with output:" >&2 + echo "$output" >&2 + fi + } + mkdir -m 0700 -p "${cfg.dataDir}/keys" chown root:root "${cfg.dataDir}/keys" if [ ! -e "${cfg.dataDir}/keys/ca.key" ]; then - ${pkgs.gnutls}/bin/certtool -p \ + silent_certtool -p \ --bits 2048 \ --outfile "${cfg.dataDir}/keys/ca.key" - ${pkgs.gnutls}/bin/certtool -s \ + silent_certtool -s \ --template "${pkgs.writeText "taskserver-ca.template" '' cn = ${cfg.fqdn} cert_signing_key @@ -372,11 +380,11 @@ in { fi if [ ! -e "${cfg.dataDir}/keys/server.key" ]; then - ${pkgs.gnutls}/bin/certtool -p \ + silent_certtool -p \ --bits 2048 \ --outfile "${cfg.dataDir}/keys/server.key" - ${pkgs.gnutls}/bin/certtool -c \ + silent_certtool -c \ --template "${pkgs.writeText "taskserver-cert.template" '' cn = ${cfg.fqdn} tls_www_server @@ -398,7 +406,7 @@ in { fi if [ ! -e "${cfg.dataDir}/keys/server.crl" ]; then - ${pkgs.gnutls}/bin/certtool --generate-crl \ + silent_certtool --generate-crl \ --template "${pkgs.writeText "taskserver-crl.template" '' expiration_days = 3650 ''}" \ |