diff options
| -rw-r--r-- | nixos/modules/services/misc/taskserver/default.nix | 25 | ||||
| -rw-r--r-- | nixos/tests/taskserver.nix | 2 |
2 files changed, 13 insertions, 14 deletions
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 063002167cf..c5c3600c1a6 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -88,8 +88,7 @@ let src = ./helper-tool.py; certtool = "${pkgs.gnutls}/bin/certtool"; inherit taskd; - inherit (cfg) dataDir user group; - inherit (cfg.pki) fqdn; + inherit (cfg) dataDir user group fqdn; }}" > "$out/main.py" cat > "$out/setup.py" <<EOF from setuptools import setup @@ -253,16 +252,16 @@ in { ''; }; - pki = { - fqdn = mkOption { - type = types.str; - default = "localhost"; - description = '' - The fully qualified domain name of this server, which is used as the - common name in the certificates. - ''; - }; + fqdn = mkOption { + type = types.str; + default = "localhost"; + description = '' + The fully qualified domain name of this server, which is also used + as the common name in the certificates. + ''; + }; + pki = { cert = mkOption { type = types.nullOr types.path; default = null; @@ -345,7 +344,7 @@ in { --outfile "${cfg.dataDir}/keys/ca.key" ${pkgs.gnutls}/bin/certtool -s \ --template "${pkgs.writeText "taskserver-ca.template" '' - cn = ${cfg.pki.fqdn} + cn = ${cfg.fqdn} cert_signing_key ca ''}" \ @@ -363,7 +362,7 @@ in { ${pkgs.gnutls}/bin/certtool -c \ --template "${pkgs.writeText "taskserver-cert.template" '' - cn = ${cfg.pki.fqdn} + cn = ${cfg.fqdn} tls_www_server encryption_key signing_key diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index ad8347a3987..1a9c8dfaca2 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -6,7 +6,7 @@ import ./make-test.nix { networking.firewall.enable = false; services.taskserver.enable = true; services.taskserver.listenHost = "::"; - services.taskserver.pki.fqdn = "server"; + services.taskserver.fqdn = "server"; services.taskserver.organisations = { testOrganisation.users = [ "alice" "foo" ]; anotherOrganisation.users = [ "bob" ]; |