From 174d2e0cfb1889dbe5cf315744993ec5ca88dcdd Mon Sep 17 00:00:00 2001 From: shimun Date: Wed, 7 Dec 2022 18:03:10 +0100 Subject: [PATCH] added: enable info per default fix: allow ca paths only --- Cargo.toml | 2 +- modules/nixos.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d73b5a7..84bfa08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -default = [ "client", "reload" ] +default = [ "client", "reload", "info" ] reload = [] info = [ "axum/json", "ssh-key/serde" ] client = [ "dep:url", "dep:reqwest" ] diff --git a/modules/nixos.nix b/modules/nixos.nix index 0b543f5..415f309 100644 --- a/modules/nixos.nix +++ b/modules/nixos.nix @@ -1,6 +1,5 @@ { config, pkgs, lib, ... }: with lib; let cfg = config.services.ssh-cert-dist; - ca = if isPath cfg.ca then cfg.ca else pkgs.writeText "ssh-ca" cfg.ca; in { options.services.ssh-cert-dist = { @@ -18,7 +17,7 @@ in default = pkgs.ssh-cert-dist; }; ca = mkOption { - type = with types; either str path; + type = types.path; }; dataDir = mkOption { type = types.path;