diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix index 86ff23c..3c35836 100755 --- a/nixosModules/server/default.nix +++ b/nixosModules/server/default.nix @@ -5,13 +5,13 @@ { imports = [ #./cloudflared.nix - # ./open-webui.nix + ./open-webui.nix ../software/beets ./calibre-web.nix # ./memos.nix # ./trilium.nix ./immich.nix - ./mealie.nix + # ./mealie.nix ./miniflux.nix ./nextcloud.nix ./nginx.nix @@ -20,6 +20,6 @@ ./syncthing.nix ./systemd.nix ./transmission.nix - ./zerotier.nix + # ./zerotier.nix ]; } diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index d72f8cd..b696388 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -15,9 +15,9 @@ in { services = { nextcloud-whiteboard-server = { - enable = false; + enable = true; settings = { - NEXTCLOUD_URL = "http://localhost:10000"; + NEXTCLOUD_URL = "https://nextcloud.zeroq.ru"; }; secrets = [ "${inputs.zeroq-credentials}/services/nextcloud/jwt-secret.txt" ]; }; @@ -48,7 +48,6 @@ in "100.64.0.0" "192.168.1.20" "localhost" - "sapphira.latxa-platy.ts.net" ]; trusted_proxies = [ "100.64.1.0" @@ -63,7 +62,7 @@ in end_to_end_encryption groupfolders impersonate - onlyoffice + # onlyoffice bookmarks calendar contacts @@ -80,7 +79,7 @@ in notify_push polls previewgenerator - richdocuments + # richdocuments spreed tasks user_oidc @@ -116,30 +115,27 @@ in # }; # }; # }; - onlyoffice = { - enable = true; - hostname = "onlyoffice.local"; - #port = 8999; - #package = stable.onlyoffice-documentserver; - }; - #rabbitmq.enable = false; + # onlyoffice = { + # enable = false; + # hostname = "onlyoffice.local"; + # }; }; - networking.hosts = { - "0.0.0.0" = [ - "onlyoffice.local" - ]; - # "127.0.0.1" = [ - # "nextcloud.zeroq.ru" - # "collabora.zeroq.ru" - # "office.zeroq.com" - # ]; - # "::1" = [ - # "nextcloud.zeroq.ru" - # "collabora.zeroq.ru" - # # "office.zeroq.com" - # ]; - }; + # networking.hosts = { + # "0.0.0.0" = [ + # "onlyoffice.local" + # ]; + # # "127.0.0.1" = [ + # # "nextcloud.zeroq.ru" + # # "collabora.zeroq.ru" + # # "office.zeroq.com" + # # ]; + # # "::1" = [ + # # "nextcloud.zeroq.ru" + # # "collabora.zeroq.ru" + # # # "office.zeroq.com" + # # ]; + # }; # systemd.services.nextcloud-config-collabora = # let @@ -183,7 +179,7 @@ in }; systemd.tmpfiles.rules = [ - "z /mnt/nextcloud 0755 nextcloud nextcloud -" + "z /mnt/nextcloud 0750 nextcloud nextcloud -" ]; environment.systemPackages = [ diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix index 045df45..383c553 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -41,26 +41,26 @@ # } # ]; # }; - "onlyoffice.local" = { - forceSSL = false; - enableACME = false; - listen = [ - { - addr = "100.64.0.0"; - port = 8080; - } - { - addr = "192.168.1.20"; - port = 8080; - } - ]; - extraConfig = '' - # Force nginx to return relative redirects. This lets the browser - # figure out the full URL. This ends up working better because it's in - # front of the reverse proxy and has the right protocol, hostname & port. - absolute_redirect off; - ''; - }; + # "onlyoffice.local" = { + # forceSSL = false; + # enableACME = false; + # listen = [ + # { + # addr = "100.64.0.0"; + # port = 8080; + # } + # { + # addr = "192.168.1.20"; + # port = 8080; + # } + # ]; + # extraConfig = '' + # # Force nginx to return relative redirects. This lets the browser + # # figure out the full URL. This ends up working better because it's in + # # front of the reverse proxy and has the right protocol, hostname & port. + # absolute_redirect off; + # ''; + # }; # "localhost:9980" = { # forceSSL = false; # enableACME = false; diff --git a/nixosModules/server/open-webui.nix b/nixosModules/server/open-webui.nix index 4533752..d1c4e03 100755 --- a/nixosModules/server/open-webui.nix +++ b/nixosModules/server/open-webui.nix @@ -23,7 +23,7 @@ ANONYMIZED_TELEMETRY = "False"; DO_NOT_TRACK = "True"; SCARF_NO_ANALYTICS = "True"; - OPENAI_API_BASE_URL = "http://localhost:1234/v1"; + OPENAI_API_BASE_URL = "http://192.168.1.100:1234/v1"; #OLLAMA_API_BASE_URL = "http://127.0.0.1:1234"; WEBUI_AUTH = "True"; ENABLE_SIGNUP = "True"; diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index c2b1312..e7f6400 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -16,18 +16,6 @@ in recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { - "mealie.zeroq.ru" = { - forceSSL = true; - enableACME = true; - kTLS = true; - locations."/" = { - proxyPass = "http://${server}:9000"; - proxyWebsockets = true; - }; - extraConfig = '' - client_max_body_size 5G; - ''; - }; "flux.zeroq.ru" = { forceSSL = true; enableACME = true; @@ -101,14 +89,14 @@ in client_max_body_size 5G; ''; }; - # "llm.zeroq.ru" = { - # addSSL = true; - # enableACME = true; - # locations."/" = { - # proxyPass = "http://atoridu.laxta-platy.ts.net:11111"; - # proxyWebsockets = true; - # }; - # }; + "llm.zeroq.ru" = { + addSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://atoridu.laxta-platy.ts.net:11112"; + proxyWebsockets = true; + }; + }; }; }; };