From 866570eb9d3d3f51d77db8250bd6ac2ce32b9055 Mon Sep 17 00:00:00 2001 From: oqyude Date: Mon, 6 Oct 2025 19:55:21 +0300 Subject: [PATCH] collabora try) --- nixosModules/server/nextcloud.nix | 58 +++++++++++------------ nixosModules/server/nginx.nix | 76 ------------------------------ nixosModules/services/node-red.nix | 2 +- nixosModules/vds/nginx.nix | 42 ++++++++--------- 4 files changed, 51 insertions(+), 127 deletions(-) diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index 92f183e..8c1f071 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -62,7 +62,7 @@ in end_to_end_encryption groupfolders impersonate - onlyoffice + # onlyoffice bookmarks calendar contacts @@ -88,35 +88,35 @@ in ; }; }; - # collabora-online = { - # enable = false; - # #package = stable.collabora-online; - # port = 9980; - # settings = { - # # Rely on reverse proxy for SSL - # server_name = "https://collabora.zeroq.ru"; - # ssl = { - # enable = false; - # termination = true; - # ssl_verification = false; - # }; - # net = { - # listen = "0.0.0.0"; - # post_allow.host = [ - # "localhost" - # "127.0.0.1" - # "0.0.0.0" - # "nextcloud.zeroq.ru" - # ]; # "::1" - # }; - # storage.wopi = { - # "@allow" = true; - # host = [ "nextcloud.zeroq.ru" "127.0.0.1" "0.0.0.0" ]; - # }; - # }; - # }; - onlyoffice = { + collabora-online = { enable = true; + #package = stable.collabora-online; + port = 9980; + settings = { + # Rely on reverse proxy for SSL + server_name = "office.zeroq.ru"; + ssl = { + enable = false; + termination = true; + ssl_verification = false; + }; + net = { + listen = "0.0.0.0"; + post_allow.host = [ + "localhost" + "0.0.0.0" + "nextcloud.zeroq.ru" + "nextcloud.local" + ]; # "::1" + }; + storage.wopi = { + "@allow" = true; + host = [ "nextcloud.zeroq.ru" "localhost" "0.0.0.0" "nextcloud.local" ]; + }; + }; + }; + onlyoffice = { + enable = false; hostname = "onlyoffice.local"; }; }; diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix index 4d520df..7bf880f 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -27,34 +27,6 @@ } ]; }; - # "localhost:3002" = { - # forceSSL = false; - # enableACME = false; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 3002; - # } - # { - # addr = "192.168.1.20"; - # port = 3002; - # } - # ]; - # }; - # "trilium" = { - # forceSSL = false; - # enableACME = false; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 11000; - # } - # { - # addr = "192.168.1.20"; - # port = 11000; - # } - # ]; - # }; # "office.zeroq.ru" = { # forceSSL = false; # enableACME = false; @@ -69,54 +41,6 @@ # absolute_redirect off; # ''; # }; - # "onlyoffice.local" = { - # forceSSL = false; - # enableACME = false; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 8001; - # } - # { - # addr = "192.168.1.20"; - # port = 8001; - # } - # ]; - # 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; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 9980; - # } - # { - # addr = "192.168.1.20"; - # port = 9980; - # } - # ]; - # }; - # "localhost:5230" = { - # forceSSL = false; - # enableACME = false; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 5230; - # } - # { - # addr = "192.168.1.20"; - # port = 5230; - # } - # ]; - # }; }; }; }; diff --git a/nixosModules/services/node-red.nix b/nixosModules/services/node-red.nix index ff3e201..5c3f397 100644 --- a/nixosModules/services/node-red.nix +++ b/nixosModules/services/node-red.nix @@ -8,7 +8,7 @@ }: { services.node-red = { - enable = true; + enable = false; port = 1880; openFirewall = true; userDir = "${xlib.dirs.services-mnt-folder}/node-red"; diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index 88cfb40..1b79062 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -28,18 +28,18 @@ in client_max_body_size 5G; ''; }; - "node-red.zeroq.ru" = { - forceSSL = true; - enableACME = true; - kTLS = true; - locations."/" = { - proxyPass = "http://${server}:1880"; - proxyWebsockets = true; - }; - extraConfig = '' - client_max_body_size 5G; - ''; - }; + # "node-red.zeroq.ru" = { + # forceSSL = true; + # enableACME = true; + # kTLS = true; + # locations."/" = { + # proxyPass = "http://${server}:1880"; + # proxyWebsockets = true; + # }; + # extraConfig = '' + # client_max_body_size 5G; + # ''; + # }; "flux.zeroq.ru" = { forceSSL = true; enableACME = true; @@ -57,7 +57,7 @@ in forceSSL = true; kTLS = true; locations."/" = { - proxyPass = "http://${server}:8000"; + proxyPass = "http://${server}:9980"; proxyWebsockets = true; }; extraConfig = '' @@ -122,14 +122,14 @@ in client_max_body_size 5G; ''; }; - "llm.zeroq.ru" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://100.86.62.4:11112"; - proxyWebsockets = true; - }; - }; + # "llm.zeroq.ru" = { + # forceSSL = true; + # enableACME = true; + # locations."/" = { + # proxyPass = "http://100.86.62.4:11112"; + # proxyWebsockets = true; + # }; + # }; }; }; };