From 164e30cd87e203836749e588d9af56c95de5731f Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sun, 12 Jun 2022 04:58:34 +0000 Subject: [PATCH] Update ACME configurations --- hosts/linode/nginx.nix | 3 ++- modules/proxy.nix | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hosts/linode/nginx.nix b/hosts/linode/nginx.nix index 9f17309..dc7c4de 100644 --- a/hosts/linode/nginx.nix +++ b/hosts/linode/nginx.nix @@ -5,7 +5,7 @@ in { security.acme = { acceptTerms = true; - email = "greg.hellings@gmail.com"; + defaults.email = "greg.hellings@gmail.com"; }; services.nginx = { @@ -30,5 +30,6 @@ in greg.proxies."thehellings.com" = { target = "http://${homepage}/"; ssl = true; + genAliases = false; }; } diff --git a/modules/proxy.nix b/modules/proxy.nix index 7e0768f..e108242 100644 --- a/modules/proxy.nix +++ b/modules/proxy.nix @@ -16,7 +16,7 @@ proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; ''; }; - serverAliases = [ "${alias name}" ]; + serverAliases = lib.mkIf dest.genAliases [ "${alias name}" ]; }; in with lib; { @@ -40,6 +40,12 @@ in with lib; { { name, config, options, ... }: { options = { + genAliases = mkOption { + type = types.bool; + description = "Whether to auto-generate short alias name"; + default = true; + }; + target = mkOption { type = types.str; description = ''The destination that is being proxied.'';