diff --git a/flake.nix b/flake.nix index 89936f4..347ebae 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,6 @@ stylix.inputs.nixpkgs.follows = "nixpkgs"; stylix.inputs.home-manager.follows = "home-manager"; - - ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git"; ozai.inputs.nixpkgs.follows = "unstable"; ozai-webui.url = "git+https://git.pvv.ntnu.no/adriangl/ozai-webui.git"; @@ -134,6 +132,8 @@ ./machines/elrond/configuration.nix ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) sops-nix.nixosModules.sops + inputs.ozai.nixosModules.ozai + inputs.ozai-webui.nixosModules.ozai-webui ]; }; }; diff --git a/machines/elrond/configuration.nix b/machines/elrond/configuration.nix index c692320..73c69c8 100644 --- a/machines/elrond/configuration.nix +++ b/machines/elrond/configuration.nix @@ -10,6 +10,7 @@ ../../profiles/webhost.nix ../../profiles/base.nix ../../services/gate.nix + ../../services/ozai.nix ./routes.nix ]; diff --git a/machines/elrond/routes.nix b/machines/elrond/routes.nix index 051285d..2d0dbd2 100644 --- a/machines/elrond/routes.nix +++ b/machines/elrond/routes.nix @@ -77,18 +77,28 @@ proxyPass = "http://100.84.215.84:8081"; }; #basicAuthFile = config.sops.secrets."nginx/defaultpass".path; - }; + }; + + #virtualHosts."azul.256.no" = { + # forceSSL = true; + # useACMEHost = config.networking.domain; + # locations."/" = { + # proxyWebsockets = true; + # proxyPass = "http://100.84.215.84:8085"; + # }; + # #basicAuthFile = config.sops.secrets."nginx/defaultpass".path; + #}; virtualHosts."azul.256.no" = { forceSSL = true; useACMEHost = config.networking.domain; locations."/" = { proxyWebsockets = true; - proxyPass = "http://100.84.215.84:8085"; + proxyPass = "http://localhost:8085"; }; #basicAuthFile = config.sops.secrets."nginx/defaultpass".path; }; - + #virtualHosts."shiori.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it"; #virtualHosts."pocket.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it"; diff --git a/machines/galadriel/configuration.nix b/machines/galadriel/configuration.nix index fd896bf..53f7d8c 100644 --- a/machines/galadriel/configuration.nix +++ b/machines/galadriel/configuration.nix @@ -22,7 +22,7 @@ ../../services/wordpress.nix ../../services/torrent.nix ../../services/mc.nix - ../../services/ozai.nix + #../../services/ozai.nix #../../services/stableDiffusion.nix ../../services/rss.nix ../../services/shiori.nix diff --git a/services/ozai.nix b/services/ozai.nix index cd71388..7d49dad 100644 --- a/services/ozai.nix +++ b/services/ozai.nix @@ -11,12 +11,4 @@ host = "0.0.0.0"; }; - services.nginx.virtualHosts."ozai.${config.networking.hostName}.${config.networking.domain}" = { - forceSSL = true; - #useACMEHost = config.networking.domain; #not sure if this will work, unless - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://${config.services.ozai.host}:${config.services.ozai.port}"; - }; - }; }