From 74759392932b0a5dd22b0532b256503191319ce3 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 23 Sep 2025 22:12:38 +0300 Subject: [PATCH] 123 --- nixosModules/server/default.nix | 2 +- nixosModules/server/nextcloud.nix | 83 ++++++++++++++++--------------- nixosModules/server/nginx.nix | 64 +++++++++++------------- nixosModules/server/trilium.nix | 2 +- nixosModules/vds/nginx.nix | 9 +--- 5 files changed, 73 insertions(+), 87 deletions(-) diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix index b5abbde..fe96454 100755 --- a/nixosModules/server/default.nix +++ b/nixosModules/server/default.nix @@ -9,7 +9,7 @@ ../software/beets ./calibre-web.nix ./memos.nix - ./trilium.nix + #./trilium.nix ./immich.nix ./mealie.nix ./miniflux.nix diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index 0dbfe0a..9ac8b86 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -102,13 +102,14 @@ in listen = "0.0.0.0"; post_allow.host = [ "localhost" - "100.64.0.0" "127.0.0.1" + "0.0.0.0" + "nextcloud.zeroq.ru" ]; # "::1" }; storage.wopi = { "@allow" = true; - host = [ "nextcloud.zeroq.ru" "127.0.0.1" ]; + host = [ "nextcloud.zeroq.ru" "127.0.0.1" "0.0.0.0" ]; }; }; }; @@ -119,46 +120,46 @@ in #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" + # "collabora.zeroq.ru" + # # "office.zeroq.com" + # ]; + # "::1" = [ + # "nextcloud.zeroq.ru" + # "collabora.zeroq.ru" + # # "office.zeroq.com" + # ]; + # }; - systemd.services.nextcloud-config-collabora = - let - inherit (config.services.nextcloud) occ; - wopi_url = "http://127.0.0.1:${toString config.services.collabora-online.port}"; - public_wopi_url = "https://collabora.zeroq.ru"; - wopi_allowlist = lib.concatStringsSep "," [ - "127.0.0.1" - "::1" - ]; - in - { - wantedBy = [ "multi-user.target" ]; - after = [ - "nextcloud-setup.service" - "coolwsd.service" - ]; - requires = [ "coolwsd.service" ]; - script = '' - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} - ${occ}/bin/nextcloud-occ richdocuments:setup - ''; - serviceConfig = { - Type = "oneshot"; - }; - }; + # systemd.services.nextcloud-config-collabora = + # let + # inherit (config.services.nextcloud) occ; + # wopi_url = "http://127.0.0.1:${toString config.services.collabora-online.port}"; + # public_wopi_url = "https://collabora.zeroq.ru"; + # wopi_allowlist = lib.concatStringsSep "," [ + # "127.0.0.1" + # "::1" + # ]; + # in + # { + # wantedBy = [ "multi-user.target" ]; + # after = [ + # "nextcloud-setup.service" + # "coolwsd.service" + # ]; + # requires = [ "coolwsd.service" ]; + # script = '' + # ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} + # ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} + # ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} + # ${occ}/bin/nextcloud-occ richdocuments:setup + # ''; + # serviceConfig = { + # Type = "oneshot"; + # }; + # }; fileSystems."/mnt/nextcloud" = { device = "${xlib.dirs.nextcloud-folder}"; diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix index 172456b..0854c52 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -27,28 +27,20 @@ } ]; }; - "trilium" = { - forceSSL = false; - enableACME = false; - listen = [ - { - addr = "100.64.0.0"; - port = 11000; - } - { - addr = "192.168.1.20"; - port = 11000; - } - # { - # addr = "0.0.0.0"; - # port = 80; - # } - # { - # addr = "0.0.0.0"; - # port = 443; - # } - ]; - }; + # "trilium" = { + # forceSSL = false; + # enableACME = false; + # listen = [ + # { + # addr = "100.64.0.0"; + # port = 11000; + # } + # { + # addr = "192.168.1.20"; + # port = 11000; + # } + # ]; + # }; # "onlyoffice" = { # forceSSL = false; # enableACME = false; @@ -63,20 +55,20 @@ # } # ]; # }; - # "localhost:9980" = { - # forceSSL = false; - # enableACME = false; - # listen = [ - # { - # addr = "100.64.0.0"; - # port = 9980; - # } - # { - # addr = "192.168.1.20"; - # port = 9980; - # } - # ]; - # }; + "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/server/trilium.nix b/nixosModules/server/trilium.nix index 432659b..5fa6bd5 100644 --- a/nixosModules/server/trilium.nix +++ b/nixosModules/server/trilium.nix @@ -5,7 +5,7 @@ }: { services.trilium-server = { - enable = true; + enable = false; nginx = { enable = true; hostName = "trilium"; diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index e0a0cf4..057c073 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -34,15 +34,8 @@ in kTLS = true; locations."/" = { proxyPass = "http://${server}:9980"; - proxyWebsockets = true; # collabora uses websockets + proxyWebsockets = true; }; - # listen = [ - # { - # addr = "0.0.0.0"; - # port = 443; - # ssl = true; - # } - # ]; #proxy_set_header X-Forwarded-Proto https; extraConfig = '' client_max_body_size 5G;