oqyude/nixos
1
0
Fork 0
mirror of https://github.com/oqyude/nixos.git synced 2026-06-11 04:30:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
Jor Oqyude
2025-09-19 21:44:35 +03:00
parent 15f64edb29
commit dde5366d89
3 changed files with 32 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixosModules/server/nextcloud.nix
+28 -28
View File
@@ -103,7 +103,7 @@
}; };
onlyoffice = { onlyoffice = {
enable = true; enable = true;
hostname = "localhost:8980"; hostname = "localhost";
}; };
rabbitmq.enable = true; rabbitmq.enable = true;
}; };
@@ -119,34 +119,34 @@
]; ];
}; };
systemd.services.nextcloud-config-collabora = # systemd.services.nextcloud-config-collabora =
let # let
inherit (config.services.nextcloud) occ; # inherit (config.services.nextcloud) occ;
wopi_url = "http://[::1]:${toString config.services.collabora-online.port}"; # wopi_url = "http://[::1]:${toString config.services.collabora-online.port}";
public_wopi_url = "https://collabora.zeroq.ru"; # public_wopi_url = "https://collabora.zeroq.ru";
wopi_allowlist = lib.concatStringsSep "," [ # wopi_allowlist = lib.concatStringsSep "," [
"127.0.0.1" # "127.0.0.1"
"::1" # "::1"
]; # ];
in # in
{ # {
wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
after = [ # after = [
"nextcloud-setup.service" # "nextcloud-setup.service"
"coolwsd.service" # "coolwsd.service"
]; # ];
requires = [ "coolwsd.service" ]; # requires = [ "coolwsd.service" ];
script = '' # script = ''
${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} # ${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 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 config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
${occ}/bin/nextcloud-occ richdocuments:setup # ${occ}/bin/nextcloud-occ richdocuments:setup
''; # '';
serviceConfig = { # serviceConfig = {
Type = "oneshot"; # Type = "oneshot";
}; # };
}; # };
fileSystems."/mnt/nextcloud" = { fileSystems."/mnt/nextcloud" = {
device = "${xlib.dirs.nextcloud-folder}"; device = "${xlib.dirs.nextcloud-folder}";
nixosModules/server/nginx.nix
+3 -3
View File
@@ -27,17 +27,17 @@
} }
]; ];
}; };
"localhost:9980" = { "localhost" = {
forceSSL = false; forceSSL = false;
enableACME = false; enableACME = false;
listen = [ listen = [
{ {
addr = "100.64.0.0"; addr = "100.64.0.0";
port = 9980; port = 8080;
} }
{ {
addr = "192.168.1.20"; addr = "192.168.1.20";
port = 9980; port = 8080;
} }
]; ];
}; };
nixosModules/vds/nginx.nix
+1 -12
View File
@@ -20,23 +20,12 @@ in
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {
proxyPass = "http://${server}:9980"; proxyPass = "http://${server}:8080";
proxyWebsockets = true; # collabora uses websockets proxyWebsockets = true; # collabora uses websockets
}; };
}; };
"immich.zeroq.ru" = { "immich.zeroq.ru" = {
# 31.57.105.253 # 31.57.105.253
# listen = [
# {
# addr = "0.0.0.0";
# port = 80;
# }
# {
# addr = "0.0.0.0";
# port = 443;
# ssl = true;
# }
# ];
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations = { locations = {