Update sound.nix, and ozai
This commit is contained in:
parent
2aa4242d34
commit
b0248a8881
|
@ -12,8 +12,6 @@
|
||||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
stylix.inputs.home-manager.follows = "home-manager";
|
stylix.inputs.home-manager.follows = "home-manager";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git";
|
ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git";
|
||||||
ozai.inputs.nixpkgs.follows = "unstable";
|
ozai.inputs.nixpkgs.follows = "unstable";
|
||||||
ozai-webui.url = "git+https://git.pvv.ntnu.no/adriangl/ozai-webui.git";
|
ozai-webui.url = "git+https://git.pvv.ntnu.no/adriangl/ozai-webui.git";
|
||||||
|
@ -134,6 +132,8 @@
|
||||||
./machines/elrond/configuration.nix
|
./machines/elrond/configuration.nix
|
||||||
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
|
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
|
inputs.ozai.nixosModules.ozai
|
||||||
|
inputs.ozai-webui.nixosModules.ozai-webui
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
../../profiles/webhost.nix
|
../../profiles/webhost.nix
|
||||||
../../profiles/base.nix
|
../../profiles/base.nix
|
||||||
../../services/gate.nix
|
../../services/gate.nix
|
||||||
|
../../services/ozai.nix
|
||||||
./routes.nix
|
./routes.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -77,18 +77,28 @@
|
||||||
proxyPass = "http://100.84.215.84:8081";
|
proxyPass = "http://100.84.215.84:8081";
|
||||||
};
|
};
|
||||||
#basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
|
#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" = {
|
virtualHosts."azul.256.no" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = config.networking.domain;
|
useACMEHost = config.networking.domain;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
proxyPass = "http://100.84.215.84:8085";
|
proxyPass = "http://localhost:8085";
|
||||||
};
|
};
|
||||||
#basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
|
#basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#virtualHosts."shiori.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it";
|
#virtualHosts."shiori.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it";
|
||||||
#virtualHosts."pocket.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it";
|
#virtualHosts."pocket.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it";
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
../../services/wordpress.nix
|
../../services/wordpress.nix
|
||||||
../../services/torrent.nix
|
../../services/torrent.nix
|
||||||
../../services/mc.nix
|
../../services/mc.nix
|
||||||
../../services/ozai.nix
|
#../../services/ozai.nix
|
||||||
#../../services/stableDiffusion.nix
|
#../../services/stableDiffusion.nix
|
||||||
../../services/rss.nix
|
../../services/rss.nix
|
||||||
../../services/shiori.nix
|
../../services/shiori.nix
|
||||||
|
|
|
@ -11,12 +11,4 @@
|
||||||
host = "0.0.0.0";
|
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}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue