diff --git a/hosts/hopper/profiles/lab/caddy.nix b/hosts/hopper/profiles/lab/caddy.nix index d549397..1466ebf 100644 --- a/hosts/hopper/profiles/lab/caddy.nix +++ b/hosts/hopper/profiles/lab/caddy.nix @@ -1,8 +1,6 @@ { config, vars, - inputs, - pkgs, ... }: let inherit (vars) domain; @@ -61,14 +59,6 @@ in { glances = mkPrivateEntry "glances" "${bridge}:${toString config.services.glances.port}"; alertmanager = mkPrivateEntry "alerts" "${bridge}:${toString config.services.prometheus.alertmanager.port}"; - base = { - hostName = "${domain}:80"; - extraConfig = '' - root * ${inputs.own-website.packages.${pkgs.system}.default} - file_server - ''; - }; - other = { hostName = "*.${domain}:80"; extraConfig = '' diff --git a/hosts/rackserv/profiles/caddy.nix b/hosts/rackserv/profiles/caddy.nix index 561ef96..cbbd287 100644 --- a/hosts/rackserv/profiles/caddy.nix +++ b/hosts/rackserv/profiles/caddy.nix @@ -1,6 +1,8 @@ { vars, config, + pkgs, + inputs, ... }: let inherit (vars) domain; @@ -37,13 +39,20 @@ in { forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT; in { misc = { - hostName = "${domain}"; - serverAliases = ["*.${domain}"]; + hostName = "*.${domain}"; useACMEHost = domain; extraConfig = '' reverse_proxy ${hopper} ''; }; + base = { + hostName = "${domain}"; + useACMEHost = domain; + extraConfig = '' + root * ${inputs.own-website.packages.${pkgs.system}.default} + file_server + ''; + }; forgejo = { hostName = "git.${domain}"; useACMEHost = domain;