From 8fc3d13eb0fae104c80f7a9cc4b36e6924ebbb6a Mon Sep 17 00:00:00 2001 From: oqyude Date: Fri, 19 Sep 2025 18:16:50 +0300 Subject: [PATCH] test --- nixosModules/server/nextcloud.nix | 32 ++++++++++++++++++++++++++++++- nixosModules/server/nginx.nix | 4 ++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index 0eae8ae..11ee8da 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -48,7 +48,7 @@ overwriteprotocol = "https"; }; extraAppsEnable = true; - appstoreEnable = false; + appstoreEnable = true; extraApps = { inherit (pkgs.nextcloud31Packages.apps) deck @@ -103,6 +103,36 @@ }; }; + # networking.hosts = { + # "127.0.0.1" = ["nextcloud.zeroq.ru" "collabora.zeroq.com"]; + # "::1" = ["nextcloud.zeroq.ru" "collabora.zeroq.ru"]; + # }; + + # systemd.services.nextcloud-config-collabora = let + # inherit (config.services.nextcloud) occ; + + # wopi_url = "http://[::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}"; options = [ diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix index 24a1ed1..a4ac560 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -33,11 +33,11 @@ listen = [ { addr = "100.64.0.0"; - port = 10000; + port = 9980; } { addr = "192.168.1.20"; - port = 10000; + port = 9980; } ]; };