diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index e003f9e..cd0cdc5 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -74,7 +74,7 @@ notify_push polls previewgenerator - richdocuments + #richdocuments spreed tasks user_oidc @@ -108,24 +108,25 @@ # }; # }; onlyoffice = { - enable = false; - hostname = "127.0.0.1"; + enable = true; + hostname = "localhost"; + port = 8890; }; #rabbitmq.enable = false; }; - networking.hosts = { - "127.0.0.1" = [ - "nextcloud.zeroq.ru" - "office.zeroq.com" - "collabora.zeroq.ru" - ]; - "::1" = [ - "nextcloud.zeroq.ru" - "collabora.zeroq.ru" - "office.zeroq.com" - ]; - }; + # networking.hosts = { + # "127.0.0.1" = [ + # "nextcloud.zeroq.ru" + # "office.zeroq.com" + # "collabora.zeroq.ru" + # ]; + # "::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 7d32250..eead24b 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -27,20 +27,20 @@ } ]; }; - # "127.0.0.1" = { - # forceSSL = false; - # enableACME = false; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 8000; - # } - # { - # addr = "192.168.1.20"; - # port = 8000; - # } - # ]; - # }; + "localhost:8890" = { + forceSSL = false; + enableACME = false; + listen = [ + { + addr = "100.64.0.0"; + port = 8890; + } + { + addr = "192.168.1.20"; + port = 8890; + } + ]; + }; # "localhost:9980" = { # forceSSL = false; # enableACME = false; diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index c9b64ee..6d91f5c 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -21,7 +21,7 @@ in forceSSL = true; kTLS = true; locations."/" = { - proxyPass = "http://${server}:8000"; + proxyPass = "http://${server}:8890"; proxyWebsockets = true; # onlyoffice uses websockets }; extraConfig = '' @@ -33,16 +33,16 @@ in forceSSL = true; kTLS = true; locations."/" = { - proxyPass = "http://${server}:9980"; + proxyPass = "http://${server}:8890"; proxyWebsockets = true; # collabora uses websockets }; - listen = [ - { - addr = "0.0.0.0"; - port = 443; - ssl = true; - } - ]; + # listen = [ + # { + # addr = "0.0.0.0"; + # port = 443; + # ssl = true; + # } + # ]; extraConfig = '' client_max_body_size 5G; '';