summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-07-16 18:57:38 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-07-16 20:38:15 +0200
commitb6188438607bbb817d17db31b061870379a8faf6 (patch)
tree431951225bacad7092fa8ef5165e75756c57ab65 /nixos/modules/services
parent5d29744f4dc2c8d62fc5a99f896aa96ea440874d (diff)
downloadnixlib-b6188438607bbb817d17db31b061870379a8faf6.tar
nixlib-b6188438607bbb817d17db31b061870379a8faf6.tar.gz
nixlib-b6188438607bbb817d17db31b061870379a8faf6.tar.bz2
nixlib-b6188438607bbb817d17db31b061870379a8faf6.tar.lz
nixlib-b6188438607bbb817d17db31b061870379a8faf6.tar.xz
nixlib-b6188438607bbb817d17db31b061870379a8faf6.tar.zst
nixlib-b6188438607bbb817d17db31b061870379a8faf6.zip
nixos/taskserver: Fix manual PKI management
The helper tool had a very early check whether the automatically created
CA key/cert are available and thus it would abort if the key was
unavailable even though we don't need or even want to have the CA key.

Unfortunately our NixOS test didn't catch this, because it was just
switching from a configuration with an automatically created CA to a
manual configuration without deleting the generated keys and certs.

This is done now in the tests and it's also fixed in the helper tool.

Reported-by: @jpotier
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/misc/taskserver/helper-tool.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py
index b97bc1df74f7..22a3d8d5311b 100644
--- a/nixos/modules/services/misc/taskserver/helper-tool.py
+++ b/nixos/modules/services/misc/taskserver/helper-tool.py
@@ -448,6 +448,8 @@ def cli(ctx):
     """
     Manage Taskserver users and certificates
     """
+    if not IS_AUTO_CONFIG:
+        return
     for path in (CA_KEY, CA_CERT, CRL_FILE):
         if not os.path.exists(path):
             msg = "CA setup not done or incomplete, missing file {}."