Compare commits

..

No commits in common. "48dbd02c9c9b460ebe01d5df377cfa08708c8593" and "8a346b6071f5bcd738c3c2222b76f731c37447cc" have entirely different histories.

3 changed files with 12 additions and 22 deletions

View file

@ -42,7 +42,7 @@ let
marsIP = "192.168.50.196"; marsIP = "192.168.50.196";
phoneIP = "192.168.50.243"; phoneIP = "192.168.50.243";
phobosIP = "192.168.50.180"; phobosIP = "192.168.50.180";
synologyIP = "192.168.50.210"; synologyIP = "192.168.50.209";
venusIP = "192.168.58.104"; venusIP = "192.168.58.104";
brotherIP = "192.168.50.195"; brotherIP = "192.168.50.195";
}; };

View file

@ -1,11 +0,0 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
radeontop
;
};
}

View file

@ -14,12 +14,10 @@ let
web web
; ;
service = ollama; service = ollama;
localhost1 = web.localhost.address0; localhost = web.localhost.address0;
localhost2 = web.localhost.address1;
hostname = config.networking.hostName; hostname = config.networking.hostName;
host = "${service.subdomain}.${web.domains.url0}"; host = "${service.subdomain}.${web.domains.url0}";
localhostLogic = if hostname == mars.name then localhost2 else localhost1;
caddyLogic = caddyLogic =
if hostname == ceres.name then if hostname == ceres.name then
{ {
@ -27,7 +25,7 @@ let
virtualHosts = { virtualHosts = {
${host} = { ${host} = {
extraConfig = '' extraConfig = ''
reverse_proxy ${localhostLogic}:${toString service.ports.port0} reverse_proxy ${localhost}:${toString service.ports.port0}
tls ${service.ssl.cert} ${service.ssl.key} tls ${service.ssl.cert} ${service.ssl.key}
''; '';
@ -61,7 +59,7 @@ in
{ {
enable = true; enable = true;
group = service.name; group = service.name;
host = "http://${localhostLogic}"; host = "http://${localhost}";
user = service.name; user = service.name;
} }
// ( // (
@ -69,9 +67,12 @@ in
{ {
# models = service.paths.path1; # models = service.paths.path1;
acceleration = "rocm"; acceleration = "rocm";
# package = pkgs.ollama.override { package = pkgs.ollama.override {
# acceleration = "rocm"; config = {
# }; rocmSupport = true;
cudaSupport = false;
};
};
} }
else else
{ {
@ -82,14 +83,14 @@ in
); );
open-webui = { open-webui = {
enable = true; enable = true;
host = localhostLogic; host = localhost;
port = service.ports.port0; port = service.ports.port0;
environment = { environment = {
ENABLE_OLLAMA_API = "True"; ENABLE_OLLAMA_API = "True";
ANONYMIZED_TELEMETRY = "False"; ANONYMIZED_TELEMETRY = "False";
DO_NOT_TRACK = "True"; DO_NOT_TRACK = "True";
SCARF_NO_ANALYTICS = "True"; SCARF_NO_ANALYTICS = "True";
OLLAMA_BASE_URL = "http://${localhostLogic}:${toString service.ports.port1}"; OLLAMA_BASE_URL = "http://${localhost}:${toString service.ports.port1}";
WEBUI_AUTH = "True"; WEBUI_AUTH = "True";
}; };
}; };