diff --git a/hosts/mups/configuration.nix b/hosts/mups/configuration.nix index 1fb24b5..99008dd 100644 --- a/hosts/mups/configuration.nix +++ b/hosts/mups/configuration.nix @@ -75,43 +75,40 @@ in { forceSSL = true; locations."/" = {proxyPass = "http://10.0.0.3:5001";}; }; - "seedbox.muon.host" = { + "stream.muon.host" = { forceSSL = true; enableACME = true; locations = { "/" = { proxyPass = "http://10.0.0.3:3013"; }; - "/api" = { + "/api/" = { proxyPass = "http://10.0.0.3:3014"; extraConfig = #sh '' - limit_req zone=api burst=20 nodelay; - # CORS headers - add_header Access-Control-Allow-Origin "*" always; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always; - add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization" always; - add_header Access-Control-Expose-Headers "Content-Length,Content-Range" always; + # add_header Access-Control-Allow-Origin "*" always; + # add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always; + # add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization" always; + # add_header Access-Control-Expose-Headers "Content-Length,Content-Range" always; # Handle preflight requests - if ($request_method = 'OPTIONS') { - add_header Access-Control-Allow-Origin "*"; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization"; - add_header Content-Type text/plain; - add_header Content-Length 0; - return 204; - } + # if ($request_method = 'OPTIONS') { + # add_header Access-Control-Allow-Origin "*"; + # add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; + # add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization"; + # add_header Content-Type text/plain; + # add_header Content-Length 0; + # return 204; + # } ''; }; - "/api/stream" = { + "/api/stream/" = { proxyPass = "http://10.0.0.3:3014"; extraConfig = #sh '' - limit_req zone=download burst=10 nodelay; proxy_set_header Range $http_range; # Streaming optimizations diff --git a/modules/nixos/core/network.nix b/modules/nixos/core/network.nix index b1886ac..c8c94e9 100644 --- a/modules/nixos/core/network.nix +++ b/modules/nixos/core/network.nix @@ -76,7 +76,7 @@ in "10.0.0.${toString wg.id}/24" "fdc9:281f:04d7:9ee9::${toString wg.id}/64" ]; - # dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"]; + dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"]; mtu = 1500; privateKeyFile = "/home/muon/wireguard-keys/private"; diff --git a/modules/nixos/server/containers/seedbox.nix b/modules/nixos/server/containers/seedbox.nix index 7cf5dc1..ebaf4e7 100644 --- a/modules/nixos/server/containers/seedbox.nix +++ b/modules/nixos/server/containers/seedbox.nix @@ -17,181 +17,177 @@ in }; }; - config = - mkIf config.mods.server.nginx.enable { - } - // mkIf cfg.enable { - networking.firewall = { - allowedTCPPorts = [port bport]; - allowedUDPPorts = [port bport]; - }; + config = mkIf cfg.enable { + networking.firewall = { + allowedTCPPorts = [port bport]; + }; - # Runtime - virtualisation.docker = { - enable = true; - autoPrune.enable = true; - }; - virtualisation.oci-containers.backend = "docker"; + # Runtime + virtualisation.docker = { + enable = true; + autoPrune.enable = true; + }; + virtualisation.oci-containers.backend = "docker"; - # Containers - virtualisation.oci-containers.containers."seedbox-backend" = { - image = "compose2nix/seedbox-backend"; - volumes = [ - "seedbox-lite_seedbox_cache:/app/cache:rw" - "seedbox-lite_seedbox_data:/app/data:rw" - ]; - ports = [ - "${toString bport}:3001/tcp" - ]; - log-driver = "journald"; - extraOptions = [ - "--network-alias=seedbox-backend" - "--network=seedbox-lite_seedbox-network" - ]; - environment = { - NODE_ENV = "production"; - ACCESS_PASSWORD = "temp_pass"; - FRONTEND_URL = "http://localhost:${toString port}"; - }; - }; - systemd.services."docker-seedbox-backend" = { - serviceConfig = { - Restart = lib.mkOverride 90 "always"; - RestartMaxDelaySec = lib.mkOverride 90 "1m"; - RestartSec = lib.mkOverride 90 "100ms"; - RestartSteps = lib.mkOverride 90 9; - }; - after = [ - "docker-network-seedbox-lite_seedbox-network.service" - "docker-volume-seedbox-lite_seedbox_cache.service" - "docker-volume-seedbox-lite_seedbox_data.service" - ]; - requires = [ - "docker-network-seedbox-lite_seedbox-network.service" - "docker-volume-seedbox-lite_seedbox_cache.service" - "docker-volume-seedbox-lite_seedbox_data.service" - ]; - partOf = [ - "docker-compose-seedbox-lite-root.target" - ]; - wantedBy = [ - "docker-compose-seedbox-lite-root.target" - ]; - }; - virtualisation.oci-containers.containers."seedbox-frontend" = { - image = "compose2nix/seedbox-frontend"; - ports = [ - "${toString port}:8080/tcp" - ]; - dependsOn = [ - "seedbox-backend" - ]; - log-driver = "journald"; - extraOptions = [ - "--network-alias=seedbox-frontend" - "--network=seedbox-lite_seedbox-network" - ]; - environment = { - NODE_ENV = "production"; - ACCESS_PASSWORD = "temp_pass"; - }; - }; - systemd.services."docker-seedbox-frontend" = { - serviceConfig = { - Restart = lib.mkOverride 90 "always"; - RestartMaxDelaySec = lib.mkOverride 90 "1m"; - RestartSec = lib.mkOverride 90 "100ms"; - RestartSteps = lib.mkOverride 90 9; - }; - after = [ - "docker-network-seedbox-lite_seedbox-network.service" - ]; - requires = [ - "docker-network-seedbox-lite_seedbox-network.service" - ]; - partOf = [ - "docker-compose-seedbox-lite-root.target" - ]; - wantedBy = [ - "docker-compose-seedbox-lite-root.target" - ]; - }; - - # Networks - systemd.services."docker-network-seedbox-lite_seedbox-network" = { - path = [pkgs.docker]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStop = "docker network rm -f seedbox-lite_seedbox-network"; - }; - script = '' - docker network inspect seedbox-lite_seedbox-network || docker network create seedbox-lite_seedbox-network --driver=bridge - ''; - partOf = ["docker-compose-seedbox-lite-root.target"]; - wantedBy = ["docker-compose-seedbox-lite-root.target"]; - }; - - # Volumes - systemd.services."docker-volume-seedbox-lite_seedbox_cache" = { - path = [pkgs.docker]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - script = '' - docker volume inspect seedbox-lite_seedbox_cache || docker volume create seedbox-lite_seedbox_cache --driver=local - ''; - partOf = ["docker-compose-seedbox-lite-root.target"]; - wantedBy = ["docker-compose-seedbox-lite-root.target"]; - }; - systemd.services."docker-volume-seedbox-lite_seedbox_data" = { - path = [pkgs.docker]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - script = '' - docker volume inspect seedbox-lite_seedbox_data || docker volume create seedbox-lite_seedbox_data --driver=local - ''; - partOf = ["docker-compose-seedbox-lite-root.target"]; - wantedBy = ["docker-compose-seedbox-lite-root.target"]; - }; - - # Builds - systemd.services."docker-build-seedbox-backend" = { - path = [pkgs.docker pkgs.git]; - serviceConfig = { - Type = "oneshot"; - TimeoutSec = 300; - }; - script = '' - cd /tmp - git clone https://github.com/hotheadhacker/seedbox-lite.git && cd seedbox-lite/server || cd seedbox-lite/server - podman build -t compose2nix/seedbox-backend . - ''; - }; - systemd.services."docker-build-seedbox-frontend" = { - path = [pkgs.docker pkgs.git]; - serviceConfig = { - Type = "oneshot"; - TimeoutSec = 300; - }; - script = '' - cd /tmp - git clone https://github.com/hotheadhacker/seedbox-lite.git && cd seedbox-lite/client || cd seedbox-lite/client - podman build -t compose2nix/seedbox-frontend --build-arg VITE_API_BASE_URL=http://localhost:${toString bport} . - ''; - }; - - # Root service - # When started, this will automatically create all resources and start - # the containers. When stopped, this will teardown all resources. - systemd.targets."docker-compose-seedbox-lite-root" = { - unitConfig = { - Description = "Root target generated by compose2nix."; - }; - wantedBy = ["multi-user.target"]; + # Containers + virtualisation.oci-containers.containers."seedbox-backend" = { + image = "compose2nix/seedbox-backend"; + volumes = [ + "seedbox-lite_seedbox_cache:/app/cache:rw" + "seedbox-lite_seedbox_data:/app/data:rw" + ]; + ports = [ + "${toString bport}:3000/tcp" + ]; + log-driver = "journald"; + extraOptions = [ + "--network-alias=seedbox-backend" + "--network=seedbox-lite_seedbox-network" + ]; + environment = { + NODE_ENV = "production"; + ACCESS_PASSWORD = "temp_pass"; + FRONTEND_URL = "http://localhost:${toString port}"; }; }; + systemd.services."docker-seedbox-backend" = { + serviceConfig = { + Restart = lib.mkOverride 90 "always"; + RestartMaxDelaySec = lib.mkOverride 90 "1m"; + RestartSec = lib.mkOverride 90 "100ms"; + RestartSteps = lib.mkOverride 90 9; + }; + after = [ + "docker-network-seedbox-lite_seedbox-network.service" + "docker-volume-seedbox-lite_seedbox_cache.service" + "docker-volume-seedbox-lite_seedbox_data.service" + ]; + requires = [ + "docker-network-seedbox-lite_seedbox-network.service" + "docker-volume-seedbox-lite_seedbox_cache.service" + "docker-volume-seedbox-lite_seedbox_data.service" + ]; + partOf = [ + "docker-compose-seedbox-lite-root.target" + ]; + wantedBy = [ + "docker-compose-seedbox-lite-root.target" + ]; + }; + virtualisation.oci-containers.containers."seedbox-frontend" = { + image = "compose2nix/seedbox-frontend"; + ports = [ + "${toString port}:8080/tcp" + ]; + dependsOn = [ + "seedbox-backend" + ]; + log-driver = "journald"; + extraOptions = [ + "--network-alias=seedbox-frontend" + "--network=seedbox-lite_seedbox-network" + ]; + environment = { + NODE_ENV = "production"; + ACCESS_PASSWORD = "temp_pass"; + }; + }; + systemd.services."docker-seedbox-frontend" = { + serviceConfig = { + Restart = lib.mkOverride 90 "always"; + RestartMaxDelaySec = lib.mkOverride 90 "1m"; + RestartSec = lib.mkOverride 90 "100ms"; + RestartSteps = lib.mkOverride 90 9; + }; + after = [ + "docker-network-seedbox-lite_seedbox-network.service" + ]; + requires = [ + "docker-network-seedbox-lite_seedbox-network.service" + ]; + partOf = [ + "docker-compose-seedbox-lite-root.target" + ]; + wantedBy = [ + "docker-compose-seedbox-lite-root.target" + ]; + }; + + # Networks + systemd.services."docker-network-seedbox-lite_seedbox-network" = { + path = [pkgs.docker]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStop = "docker network rm -f seedbox-lite_seedbox-network"; + }; + script = '' + docker network inspect seedbox-lite_seedbox-network || docker network create seedbox-lite_seedbox-network --driver=bridge + ''; + partOf = ["docker-compose-seedbox-lite-root.target"]; + wantedBy = ["docker-compose-seedbox-lite-root.target"]; + }; + + # Volumes + systemd.services."docker-volume-seedbox-lite_seedbox_cache" = { + path = [pkgs.docker]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + docker volume inspect seedbox-lite_seedbox_cache || docker volume create seedbox-lite_seedbox_cache --driver=local + ''; + partOf = ["docker-compose-seedbox-lite-root.target"]; + wantedBy = ["docker-compose-seedbox-lite-root.target"]; + }; + systemd.services."docker-volume-seedbox-lite_seedbox_data" = { + path = [pkgs.docker]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + docker volume inspect seedbox-lite_seedbox_data || docker volume create seedbox-lite_seedbox_data --driver=local + ''; + partOf = ["docker-compose-seedbox-lite-root.target"]; + wantedBy = ["docker-compose-seedbox-lite-root.target"]; + }; + + # Builds + systemd.services."docker-build-seedbox-backend" = { + path = [pkgs.docker pkgs.git]; + serviceConfig = { + Type = "oneshot"; + TimeoutSec = 300; + }; + script = '' + cd /tmp + git clone https://github.com/hotheadhacker/seedbox-lite.git && cd seedbox-lite/server || cd seedbox-lite/server + podman build -t compose2nix/seedbox-backend . + ''; + }; + systemd.services."docker-build-seedbox-frontend" = { + path = [pkgs.docker pkgs.git]; + serviceConfig = { + Type = "oneshot"; + TimeoutSec = 300; + }; + script = '' + cd /tmp + git clone https://github.com/hotheadhacker/seedbox-lite.git && cd seedbox-lite/client || cd seedbox-lite/client + podman build -t compose2nix/seedbox-frontend --build-arg VITE_API_BASE_URL=http://localhost:${toString bport} . + ''; + }; + + # Root service + # When started, this will automatically create all resources and start + # the containers. When stopped, this will teardown all resources. + systemd.targets."docker-compose-seedbox-lite-root" = { + unitConfig = { + Description = "Root target generated by compose2nix."; + }; + wantedBy = ["multi-user.target"]; + }; + }; }