From 813a4f4340849b407eaa9d03f65fbe8f3e716bf2 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 14 Jan 2024 12:37:14 +0900 Subject: feat(modules): use types.path for secret paths --- modules/services/ldap.nix | 2 +- modules/services/matrix-bridge.nix | 2 +- modules/services/matrix-homeserver.nix | 8 ++++---- modules/services/metrics.nix | 2 +- modules/services/rss.nix | 2 +- modules/services/searx.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/services/ldap.nix b/modules/services/ldap.nix index 7c4724f..e75d739 100644 --- a/modules/services/ldap.nix +++ b/modules/services/ldap.nix @@ -11,7 +11,7 @@ in dc = mkOption { type = types.str; }; tld = mkOption { type = types.str; }; tls.acmeHost = mkOption { type = types.str; default = "${cfg.dc}.${cfg.tld}"; }; - secrets.rootPass = mkOption { type = types.str; description = "path to the root password file"; }; + secrets.rootPass = mkOption { type = types.path; description = "path to the root password file"; }; }; config = mkIf cfg.enable { diff --git a/modules/services/matrix-bridge.nix b/modules/services/matrix-bridge.nix index a9d3c4f..3e86706 100644 --- a/modules/services/matrix-bridge.nix +++ b/modules/services/matrix-bridge.nix @@ -14,7 +14,7 @@ in enable = mkEnableOption "matrix-bridge"; domain = mkOption { type = types.str; }; realHost = mkOption { type = types.str; default = "matrix.${cfg.domain}"; }; - secrets.mautrix-envs = mkOption { type = types.str; description = "path to the mautrix-* environment file"; }; + secrets.mautrix-envs = mkOption { type = types.path; description = "path to the mautrix-* environment file"; }; }; config = mkIf cfg.enable { diff --git a/modules/services/matrix-homeserver.nix b/modules/services/matrix-homeserver.nix index 36d6dbc..3dc188b 100644 --- a/modules/services/matrix-homeserver.nix +++ b/modules/services/matrix-homeserver.nix @@ -20,10 +20,10 @@ in shared_secret = mkOption { type = types.str; }; }; secrets = { - matrix-server-key = mkOption { type = types.str; description = "path to the server key"; }; - matrix-shared-secret = mkOption { type = types.str; description = "path to the registration shared secret"; }; - extra-config-path = mkOption { type = types.nullOr types.str; description = "path to the extra configuration file to source"; }; - sliding-sync-secret = mkOption { type = types.nullOr types.str; description = "path to the sliding sync secret"; }; + matrix-server-key = mkOption { type = types.path; description = "path to the server key"; }; + matrix-shared-secret = mkOption { type = types.path; description = "path to the registration shared secret"; }; + extra-config-path = mkOption { type = types.nullOr types.path; description = "path to the extra configuration file to source"; }; + sliding-sync-secret = mkOption { type = types.nullOr types.path; description = "path to the sliding sync secret"; }; }; }; diff --git a/modules/services/metrics.nix b/modules/services/metrics.nix index b06a401..5f03389 100644 --- a/modules/services/metrics.nix +++ b/modules/services/metrics.nix @@ -9,7 +9,7 @@ in enable = mkEnableOption "metrics"; domain = mkOption { type = types.str; }; tls.acmeHost = mkOption { type = types.str; default = cfg.domain; }; - secrets.adminPassword = mkOption { type = types.str; description = "path to the admin password"; }; + secrets.adminPassword = mkOption { type = types.path; description = "path to the admin password"; }; }; config = mkIf cfg.enable { diff --git a/modules/services/rss.nix b/modules/services/rss.nix index fa982e4..c9663ee 100644 --- a/modules/services/rss.nix +++ b/modules/services/rss.nix @@ -9,7 +9,7 @@ in enable = mkEnableOption "RSS Aggregator"; domain = mkOption { type = types.str; }; realHost = mkOption { type = types.str; default = "rss.${cfg.domain}"; }; - secrets.admin-password = mkOption { type = types.str; description = "path to file containing admin password"; }; + secrets.admin-password = mkOption { type = types.path; description = "path to file containing admin password"; }; bridge = { enable = mkEnableOption "RSS Bridge"; domain = mkOption { type = types.str; default = cfg.domain; }; diff --git a/modules/services/searx.nix b/modules/services/searx.nix index 1436474..98f27d9 100644 --- a/modules/services/searx.nix +++ b/modules/services/searx.nix @@ -10,7 +10,7 @@ in package = mkOption { type = types.package; default = pkgs.searxng; }; domain = mkOption { type = types.str; }; realHost = mkOption { type = types.str; }; - secrets.searx-env = mkOption { type = types.str; description = "path to the searx secret envfile"; }; + secrets.searx-env = mkOption { type = types.path; description = "path to the searx secret envfile"; }; }; config = mkIf cfg.enable { -- cgit 1.4.1