diff --git a/hosts/layne/services/apps/jellyfin.nix b/hosts/layne/services/apps/jellyfin.nix index 1f96910..1c8d869 100644 --- a/hosts/layne/services/apps/jellyfin.nix +++ b/hosts/layne/services/apps/jellyfin.nix @@ -7,6 +7,11 @@ _: { reverse_proxy 127.0.0.1:8096 ''; }; + "watch.local.adtya.xyz" = { + extraConfig = '' + reverse_proxy 127.0.0.1:8096 + ''; + }; "jellyfin.labs.adtya.xyz" = { extraConfig = '' reverse_proxy 127.0.0.1:8096 diff --git a/hosts/rico0/services/apps/alertmanager.nix b/hosts/rico0/services/apps/alertmanager.nix index 7764055..9dfe4f7 100644 --- a/hosts/rico0/services/apps/alertmanager.nix +++ b/hosts/rico0/services/apps/alertmanager.nix @@ -4,7 +4,6 @@ _: { virtualHosts."alertmanager.labs.adtya.xyz" = { extraConfig = '' reverse_proxy 127.0.0.1:9093 - tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key ''; }; }; diff --git a/hosts/rico0/services/apps/blocky.nix b/hosts/rico0/services/apps/blocky.nix index 4a99946..a566018 100644 --- a/hosts/rico0/services/apps/blocky.nix +++ b/hosts/rico0/services/apps/blocky.nix @@ -15,7 +15,6 @@ _: { virtualHosts."blocky.labs.adtya.xyz" = { extraConfig = '' reverse_proxy 127.0.0.1:8080 - tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key ''; }; }; diff --git a/hosts/rico0/services/apps/grafana.nix b/hosts/rico0/services/apps/grafana.nix index e1d9415..b342e26 100644 --- a/hosts/rico0/services/apps/grafana.nix +++ b/hosts/rico0/services/apps/grafana.nix @@ -4,7 +4,6 @@ _: { virtualHosts."grafana.labs.adtya.xyz" = { extraConfig = '' reverse_proxy 127.0.0.1:9091 - tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key ''; }; }; diff --git a/hosts/rico0/services/apps/loki.nix b/hosts/rico0/services/apps/loki.nix index 5f8a11a..cb44bee 100644 --- a/hosts/rico0/services/apps/loki.nix +++ b/hosts/rico0/services/apps/loki.nix @@ -4,7 +4,6 @@ _: { virtualHosts."loki.labs.adtya.xyz" = { extraConfig = '' reverse_proxy 127.0.0.1:3100 - tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key ''; }; }; diff --git a/hosts/rico0/services/apps/prometheus.nix b/hosts/rico0/services/apps/prometheus.nix index 9e5ea23..4a1491a 100644 --- a/hosts/rico0/services/apps/prometheus.nix +++ b/hosts/rico0/services/apps/prometheus.nix @@ -4,7 +4,6 @@ _: { virtualHosts."prometheus.labs.adtya.xyz" = { extraConfig = '' reverse_proxy 127.0.0.1:9090 - tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key ''; }; }; diff --git a/hosts/shared/caddy.nix b/hosts/shared/caddy.nix index b21ee24..13d1325 100644 --- a/hosts/shared/caddy.nix +++ b/hosts/shared/caddy.nix @@ -15,6 +15,7 @@ globalConfig = '' acme_dns digitalocean {env.DO_API_TOKEN} ''; + logFormat = "level INFO"; }; systemd.services.caddy.serviceConfig.EnvironmentFile = config.sops.secrets."digitalocean/token_file".path; networking.firewall.allowedTCPPorts = [ 80 443 ]; diff --git a/hosts/shared/prometheus-exporters.nix b/hosts/shared/prometheus-exporters.nix index 747cf5a..94dce4f 100644 --- a/hosts/shared/prometheus-exporters.nix +++ b/hosts/shared/prometheus-exporters.nix @@ -16,7 +16,6 @@ reverse_proxy ${config.services.prometheus.exporters.postgres.listenAddress}:${toString config.services.prometheus.exporters.postgres.port} } ''} - tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key ''; }; };