diff --git a/caddy/Caddyfile b/caddy/Caddyfile index a1db475..42d98fb 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -37,13 +37,18 @@ reverse_proxy jellyfin:8096 } - @ente host http://ente.akeley.tech + @ente host ente.akeley.tech handle @ente { - reverse_proxy ente-photos:8080 + reverse_proxy ente-web:3000 } - @sonarr host http://sonarr.akeley.tech - handle @ente { + @museum host museum.akeley.tech + handle @museum { + reverse_proxy ente-museum:8080 + } + + @sonarr host sonarr.akeley.tech + handle @sonarr { reverse_proxy sonarr:8989 } } diff --git a/config.scm b/config.scm index cec2d69..022b430 100644 --- a/config.scm +++ b/config.scm @@ -36,10 +36,6 @@ (service docker-service-type (docker-configuration (environment-variables (list "TMPDIR=/tmp/dockerd")))) -;; (service postgresql-service-type -;; (postgresql-configuration -;; (postgresql postgresql-16) -;; (data-directory "/data/postgres"))) (service oci-container-service-type (list (oci-container-configuration @@ -120,6 +116,7 @@ (image "plexinc/pms-docker") (provision "plex") (network "sandbox") + (extra-arguments '("--device=/dev/dvb")) (ports '( ("32400" . "32400") ("8324" . "8324") @@ -169,7 +166,7 @@ (oci-container-configuration (image "postgres:15") (provision "ente-db") - (network "ente") + (network "sandbox") (respawn? #t) (ports '( ("5433" . "5432"))) @@ -182,9 +179,9 @@ (oci-container-configuration (image "ghcr.io/ente-io/server") - (provision "ente-photos") + (provision "ente-museum") (requirement '(ente-db minio)) - (network "ente") + (network "sandbox") (ports '( ("8090" . "8080") ("2112" . "2112"))) @@ -195,11 +192,25 @@ '("/data/docker/volumes/ente/museum.yaml" . "/museum.yaml:ro") '("/data/docker/volumes/ente/credentials.yaml" . "/credentials.yaml:ro") '("/data/docker/volumes/ente/data" . "/data:ro")))) + + (oci-container-configuration + (image "ghcr.io/ente-io/web") + (provision "ente-web") + (requirement '(ente-museum)) + (network "sandbox") + (ports '( + ("3010" . "3000") + ("3011" . "3001") + ("3012" . "3002") + ("3013" . "3003"))) + (environment (list + '("ENTE_API_ORIGIN" . "https://museum.akeley.tech") + '("ENTE_ALBUMS_ORIGIN" . "https://localhost:3002")))) (oci-container-configuration (image "minio/minio") (provision "minio") - (network "ente") + (network "sandbox") (command '("server" "--address" ":3200" "--console-address" ":3201" "/data")) (ports '( ("3200" . "3200")