From 4caa14d0416c8ac14e0ac617a1eec22b9df830f6 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 28 Feb 2024 07:31:21 -0500 Subject: nixos: remove root password --- modules/nixos/server/mixins/cloudflared.nix | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'modules/nixos/server/mixins/cloudflared.nix') diff --git a/modules/nixos/server/mixins/cloudflared.nix b/modules/nixos/server/mixins/cloudflared.nix index 5f75a35..26c0714 100644 --- a/modules/nixos/server/mixins/cloudflared.nix +++ b/modules/nixos/server/mixins/cloudflared.nix @@ -9,6 +9,15 @@ in { options.server.mixins.cloudflared = { enable = lib.mkEnableOption "cloudflared mixin"; + tunnelName = lib.mkOption { + type = lib.types.str; + default = "${config.networking.hostName}-nginx"; + example = lib.literalExpression "my-tunnel"; + description = lib.mdDoc '' + Name of the default tunnel being created + ''; + }; + manageSecrets = lib.mkEnableOption "automatic secrets management" // { @@ -21,18 +30,12 @@ in { { services.cloudflared = { enable = true; - tunnels = { - "${config.networking.hostName}-nginx" = - { - default = "http_status:404"; + tunnels.${cfg.tunnelName} = { + default = "http_status:404"; - ingress = lib.genAttrs (builtins.attrNames nginx.virtualHosts) ( - _: {service = "http://localhost:${toString nginx.defaultHTTPListenPort}";} - ); - } - // lib.optionalAttrs cfg.manageSecrets { - credentialsFile = config.age.secrets.cloudflaredCreds.path; - }; + ingress = lib.genAttrs (builtins.attrNames nginx.virtualHosts) ( + _: {service = "http://localhost:${toString nginx.defaultHTTPListenPort}";} + ); }; }; } @@ -44,6 +47,10 @@ in { owner = "cloudflared"; group = "cloudflared"; }; + + services.cloudflared.tunnels.${cfg.tunnelName} = { + credentialsFile = config.age.secrets.cloudflaredCreds.path; + }; }) ] ); -- cgit v1.2.3