added: enable info per default

fix: allow ca paths only
This commit is contained in:
shimun 2022-12-07 18:03:10 +01:00
parent 4a69fbead6
commit 174d2e0cfb
Signed by: shimun
GPG Key ID: E0420647856EA39E
2 changed files with 2 additions and 3 deletions

View File

@ -7,7 +7,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[features] [features]
default = [ "client", "reload" ] default = [ "client", "reload", "info" ]
reload = [] reload = []
info = [ "axum/json", "ssh-key/serde" ] info = [ "axum/json", "ssh-key/serde" ]
client = [ "dep:url", "dep:reqwest" ] client = [ "dep:url", "dep:reqwest" ]

View File

@ -1,6 +1,5 @@
{ config, pkgs, lib, ... }: with lib; let { config, pkgs, lib, ... }: with lib; let
cfg = config.services.ssh-cert-dist; cfg = config.services.ssh-cert-dist;
ca = if isPath cfg.ca then cfg.ca else pkgs.writeText "ssh-ca" cfg.ca;
in in
{ {
options.services.ssh-cert-dist = { options.services.ssh-cert-dist = {
@ -18,7 +17,7 @@ in
default = pkgs.ssh-cert-dist; default = pkgs.ssh-cert-dist;
}; };
ca = mkOption { ca = mkOption {
type = with types; either str path; type = types.path;
}; };
dataDir = mkOption { dataDir = mkOption {
type = types.path; type = types.path;