This commit is contained in:
2025-09-23 22:12:38 +03:00
parent df659b8a4c
commit 7475939293
5 changed files with 73 additions and 87 deletions
+42 -41
View File
@@ -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}";