diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 82b38d18c639..47311ce567e9 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -149,19 +149,4 @@ rec { paramsToRenderedStrings prefixedAttrs (mapAttrs (_n: _v: p) prefixedAttrs); }; - mkPostfixedAttrsOfParams = params: description: { - _type = "param"; - option = mkOption { - type = types.attrsOf (types.submodule { options = paramsToOptions params; }); - default = { }; - description = description; - }; - render = - postfix: attrs: - let - postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs; - in - paramsToRenderedStrings postfixedAttrs (mapAttrs (_n: _v: params) postfixedAttrs); - }; - } diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 2da955cc07bd..f17d36341e1d 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -433,7 +433,7 @@ in located, the first certificate is used. ''; - cert = mkPostfixedAttrsOfParams certParams '' + cert = mkPrefixedAttrsOfParams certParams '' Section for a certificate candidate to use for authentication. Certificates in certs are transmitted as binary blobs, these sections offer more flexibility. @@ -568,7 +568,7 @@ in or an absolute path. ''; - cert = mkPostfixedAttrsOfParams certParams '' + cert = mkPrefixedAttrsOfParams certParams '' Section for a certificate candidate to use for authentication. Certificates in certs are transmitted as binary blobs, these sections offer more flexibility. @@ -590,7 +590,7 @@ in swanctl `x509ca` directory or an absolute path. ''; - cacert = mkPostfixedAttrsOfParams certParams '' + cacert = mkPrefixedAttrsOfParams certParams '' Section for a CA certificate to accept for authentication. Certificates in cacerts are transmitted as binary blobs, these sections offer more flexibility.