reversed the ingress
This commit is contained in:
1 parent
39ffdfa219
commit
58e0705aca
3 files changed
+16
-2
No files matched your search
@@ -12,7 +12,7 @@ let
|
|||||||
POSTGRES_DB = "immich";
|
POSTGRES_DB = "immich";
|
||||||
DB_DATABASE_NAME = "immich";
|
DB_DATABASE_NAME = "immich";
|
||||||
};
|
};
|
||||||
nfsVolume = skygUtils.container-services.nfs.tnas1;
|
nfsVolume = skygUtils.container-services.nfsVols.tnas1;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
age.secrets.immich-shared.file = skyg-secrets.immich-shared;
|
age.secrets.immich-shared.file = skyg-secrets.immich-shared;
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ let
|
|||||||
publicGitea = config.skyg.internalNetworkingMap.apps.public-gitea;
|
publicGitea = config.skyg.internalNetworkingMap.apps.public-gitea;
|
||||||
certDomain = "home.sosnovsky.ca";
|
certDomain = "home.sosnovsky.ca";
|
||||||
giteaCertDomain = "gitea.skyg.ca";
|
giteaCertDomain = "gitea.skyg.ca";
|
||||||
|
# k8s Traefik ingress — fallback for hosts caddy doesn't handle itself.
|
||||||
|
k8sIngress = "10.0.100.1";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
skyg.nixos.common.container-services.caddy = {
|
skyg.nixos.common.container-services.caddy = {
|
||||||
@@ -49,6 +51,18 @@ in
|
|||||||
tls /etc/caddy/tls/gitea/fullchain.pem /etc/caddy/tls/gitea/key.pem
|
tls /etc/caddy/tls/gitea/fullchain.pem /etc/caddy/tls/gitea/key.pem
|
||||||
reverse_proxy ${publicGitea.ip}:80
|
reverse_proxy ${publicGitea.ip}:80
|
||||||
}
|
}
|
||||||
|
# Fallback: any other *.home.sosnovsky.ca host goes to the k8s Traefik.
|
||||||
|
# Host + SNI are preserved so Traefik routes on the original hostname.
|
||||||
|
*.home.sosnovsky.ca {
|
||||||
|
tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem
|
||||||
|
reverse_proxy https://${k8sIngress}:443 {
|
||||||
|
header_up Host {http.request.host}
|
||||||
|
transport http {
|
||||||
|
tls
|
||||||
|
tls_server_name {http.request.host}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
volumes = [
|
volumes = [
|
||||||
"/var/lib/acme/${certDomain}/fullchain.pem:/etc/caddy/tls/fullchain.pem:ro"
|
"/var/lib/acme/${certDomain}/fullchain.pem:/etc/caddy/tls/fullchain.pem:ro"
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
imports = [
|
imports = [
|
||||||
./caddy.nix
|
./caddy.nix
|
||||||
./acme.nix
|
./acme.nix
|
||||||
./buildbot.nix
|
# ./buildbot.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user