From f6b25335ecb640120fa6e0129073329ce5748137 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 23 Sep 2025 22:28:16 +0300 Subject: [PATCH] 123 --- nixosModules/server/nextcloud.nix | 33 ++++++++++++++++-------------- nixosModules/server/nginx.nix | 34 +++++++++++++++---------------- nixosModules/vds/nginx.nix | 24 +++++++++++----------- 3 files changed, 47 insertions(+), 44 deletions(-) diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index 9ac8b86..4d60707 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -77,7 +77,7 @@ in notify_push polls previewgenerator - richdocuments + # richdocuments spreed tasks user_oidc @@ -87,7 +87,7 @@ in }; }; collabora-online = { - enable = true; + enable = false; #package = stable.collabora-online; port = 9980; settings = { @@ -114,24 +114,27 @@ in }; }; onlyoffice = { - enable = false; + enable = true; hostname = "onlyoffice"; }; #rabbitmq.enable = false; }; - # networking.hosts = { - # "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" + ]; + # "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 diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix index 0854c52..44afbbb 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -41,34 +41,34 @@ # } # ]; # }; - # "onlyoffice" = { - # forceSSL = false; - # enableACME = false; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 8080; - # } - # { - # addr = "192.168.1.20"; - # port = 8080; - # } - # ]; - # }; - "localhost:9980" = { + "onlyoffice" = { forceSSL = false; enableACME = false; listen = [ { addr = "100.64.0.0"; - port = 9980; + port = 8000; } { addr = "192.168.1.20"; - port = 9980; + port = 8000; } ]; }; + # "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; diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index 057c073..1803322 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -16,18 +16,18 @@ in recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { - # "office.zeroq.ru" = { - # enableACME = true; - # forceSSL = true; - # kTLS = true; - # locations."/" = { - # proxyPass = "http://${server}:8890"; - # proxyWebsockets = true; # onlyoffice uses websockets - # }; - # extraConfig = '' - # client_max_body_size 5G; - # ''; - # }; + "office.zeroq.ru" = { + enableACME = true; + forceSSL = true; + kTLS = true; + locations."/" = { + proxyPass = "http://${server}:8000"; + proxyWebsockets = true; # onlyoffice uses websockets + }; + extraConfig = '' + client_max_body_size 5G; + ''; + }; "collabora.zeroq.ru" = { enableACME = true; forceSSL = true;