diff --git a/terranix/jitsi-cloud/plops/configs/nixserver-host/workadventure.nix b/terranix/jitsi-cloud/plops/configs/nixserver-host/workadventure.nix index a585ac7..bae3733 100644 --- a/terranix/jitsi-cloud/plops/configs/nixserver-host/workadventure.nix +++ b/terranix/jitsi-cloud/plops/configs/nixserver-host/workadventure.nix @@ -74,11 +74,6 @@ in { services.nginx.enable = true; - #services.nginx.recommendedGzipSettings = true; - #services.nginx.recommendedOptimisation = true; - #services.nginx.recommendedProxySettings = true; - #services.nginx.recommendedTlsSettings = true; - systemd.services.workadventureRepository = { enable = true; wantedBy = [ "multi-user.target" ]; @@ -116,24 +111,6 @@ in { virtualisation.oci-containers.backend = "docker"; - #virtualisation.oci-containers.containers.reverse-proxy = { - # image = "traefik:v2.0"; - # cmd = [ - # "--api.insecure=true" - # "--providers.docker" - # "--entryPoints.web.address=:80" - # "--entryPoints.websecure.address=:443" - # ]; - # ports = [ - # "80:80" - # "443:443" - # # The Web UI (enabled by --api.insecure=true) - # "8080:8080" - # ]; - # dependsOn = [ "back" "front" ]; - # volumes = [ "/var/run/docker.sock:/var/run/docker.sock" ]; - #}; - virtualisation.oci-containers.containers.front = { image = "thecodingmachine/nodejs:14"; environment = { @@ -156,18 +133,7 @@ in { volumes = [ "${homeFolder}/front:/usr/src/app" ]; #ports = [ "${toString playPort}:8080" ]; ports = [ "0.0.0.0:${toString playPort}:8080" ]; - extraOptions = let - labelFile = pkgs.writeText "front-labels" '' - #traefik.http.routers.front.rule=Host(`play.${domain}`) - #traefik.http.routers.front.entryPoints=web,traefik - #traefik.http.services.front.loadbalancer.server.port=8080 - - #traefik.http.routers.front-ssl.rule=Host(`play.${domain}`) - #traefik.http.routers.front-ssl.entryPoints=websecure - #traefik.http.routers.front-ssl.tls=false - #traefik.http.routers.front-ssl.service=front - ''; - in [ "--label-file" (toString labelFile) "--network=workadventure" ]; + extraOptions = [ "--network=workadventure" ]; }; systemd.services.docker-front.serviceConfig = { StandardOutput = lib.mkForce "journal"; @@ -208,18 +174,7 @@ in { }; volumes = [ "${homeFolder}/pusher:/usr/src/app" ]; ports = [ "${toString pusherPort}:8080" ]; - extraOptions = let - labelFile = pkgs.writeText "pusher-labels" '' - #traefik.http.routers.pusher.rule=Host(`pusher.${domain}`) - #traefik.http.routers.pusher.entryPoints=web - #traefik.http.services.pusher.loadbalancer.server.port=8080 - #traefik.http.routers.pusher-ssl.rule=Host(`pusher.${domain}`) - #traefik.http.routers.pusher-ssl.entryPoints=websecure - #traefik.http.routers.pusher-ssl.tls=false - #traefik.http.routers.pusher-ssl.service=pusher - #traefik.http.middlewares.api.headers.customResponseHeaders.Access-Control-Allow-Origin=http://play.${domain} - ''; - in [ "--label-file" (toString labelFile) "--network=workadventure" ]; + extraOptions = [ "--network=workadventure" ]; }; systemd.services.docker-pusher.serviceConfig = { StandardOutput = lib.mkForce "journal"; @@ -247,17 +202,7 @@ in { }; volumes = [ "${homeFolder}/maps:/var/www/html" ]; ports = [ "${toString mapsPort}:80" ]; - extraOptions = let - labelFile = pkgs.writeText "maps-labels" '' - #traefik.http.routers.maps.rule=Host(`maps.${domain}`) - #traefik.http.routers.maps.entryPoints=web,traefik - #traefik.http.services.maps.loadbalancer.server.port=80 - #traefik.http.routers.maps-ssl.rule=Host(`maps.${domain}`) - #traefik.http.routers.maps-ssl.entryPoints=websecure - #traefik.http.routers.maps-ssl.tls=false - #traefik.http.routers.maps-ssl.service=maps - ''; - in [ "--label-file" (toString labelFile) "--network=workadventure" ]; + extraOptions = [ "--network=workadventure" ]; }; systemd.services.docker-maps.serviceConfig = { StandardOutput = lib.mkForce "journal"; @@ -289,18 +234,7 @@ in { }; volumes = [ "${homeFolder}/back:/usr/src/app" ]; ports = [ "${toString apiPort}:8080" ]; - extraOptions = let - labelFile = pkgs.writeText "back-labels" '' - #traefik.http.routers.back.rule=Host(`api.${domain}`) - #traefik.http.routers.back.entryPoints=web - #traefik.http.services.back.loadbalancer.server.port=8080 - #traefik.http.routers.back-ssl.rule=Host(`api.${domain}`) - #traefik.http.routers.back-ssl.entryPoints=websecure - #traefik.http.routers.back-ssl.tls=false - #traefik.http.routers.back-ssl.service=back - #traefik.http.middlewares.api.headers.customResponseHeaders.Access-Control-Allow-Origin=http://play.${domain} - ''; - in [ "--label-file" (toString labelFile) "--network=workadventure" ]; + extraOptions = [ "--network=workadventure" ]; }; systemd.services.docker-back.serviceConfig = { StandardOutput = lib.mkForce "journal"; @@ -325,17 +259,7 @@ in { }; volumes = [ "${homeFolder}/uploader:/usr/src/app" ]; ports = [ "${toString uploaderPort}:8080" ]; - extraOptions = let - labelFile = pkgs.writeText "uploader-labels" '' - #traefik.http.routers.uploader.rule=Host(`uploader.${domain}`) - #traefik.http.routers.uploader.entryPoints=web - #traefik.http.services.uploader.loadbalancer.server.port=8080 - #traefik.http.routers.uploader-ssl.rule=Host(`uploader.${domain}`) - #traefik.http.routers.uploader-ssl.entryPoints=websecure - #traefik.http.routers.uploader-ssl.tls=true - #traefik.http.routers.uploader-ssl.service=uploader - ''; - in [ "--label-file" (toString labelFile) "--network=workadventure" ]; + extraOptions = [ "--network=workadventure" ]; }; systemd.services.docker-uploader.serviceConfig = { StandardOutput = lib.mkForce "journal"; @@ -360,17 +284,7 @@ in { }; volumes = [ "${homeFolder}/website:/var/www/html" ]; ports = [ "${toString mainPort}:80" ]; - extraOptions = let - labelFile = pkgs.writeText "website-labels" '' - #traefik.http.routers.website.rule=Host(`${domain}`) - #traefik.http.routers.website.entryPoints=web - #traefik.http.services.website.loadbalancer.server.port=8080 - #traefik.http.routers.website-ssl.rule=Host(`${domain}`) - #traefik.http.routers.website-ssl.entryPoints=websecure - #traefik.http.routers.website-ssl.tls=true - #traefik.http.routers.website-ssl.service=website - ''; - in [ "--label-file" (toString labelFile) "--network=workadventure" ]; + extraOptions = [ "--network=workadventure" ]; }; systemd.services.docker-website.serviceConfig = { StandardOutput = lib.mkForce "journal";