This commit is contained in:
2025-09-20 11:13:28 +03:00
parent 9b5d393bab
commit cb14814677
3 changed files with 82 additions and 68 deletions
+39 -39
View File
@@ -26,7 +26,7 @@
redis = true; redis = true;
memcached = true; memcached = true;
}; };
maxUploadSize = "2G"; maxUploadSize = "5G";
config = { config = {
dbtype = "pgsql"; dbtype = "pgsql";
dbuser = "nextcloud"; dbuser = "nextcloud";
@@ -92,6 +92,7 @@
ssl = { ssl = {
enable = false; enable = false;
termination = true; termination = true;
ssl_verification = false;
}; };
net = { net = {
listen = "loopback"; listen = "loopback";
@@ -110,45 +111,44 @@
# rabbitmq.enable = false; # rabbitmq.enable = false;
}; };
# networking.hosts = { networking.hosts = {
# "127.0.0.1" = [ "127.0.0.1" = [
# "nextcloud.zeroq.ru" "nextcloud.zeroq.ru"
# "collabora.zeroq.com" "collabora.zeroq.com"
# ]; ];
# "::1" = [ "::1" = [
# "nextcloud.zeroq.ru" "nextcloud.zeroq.ru"
# "collabora.zeroq.ru" "collabora.zeroq.ru"
# ]; ];
# }; };
# 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}";
+16 -16
View File
@@ -33,28 +33,28 @@
# listen = [ # listen = [
# { # {
# addr = "100.64.0.0"; # addr = "100.64.0.0";
# port = 8080; # port = 80;
# } # }
# { # {
# addr = "192.168.1.20"; # addr = "192.168.1.20";
# port = 8080; # port = 80;
# }
# ];
# };
# "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;
}
];
};
}; };
}; };
}; };
+27 -13
View File
@@ -16,23 +16,33 @@ in
recommendedProxySettings = true; recommendedProxySettings = true;
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts = { virtualHosts = {
# "collabora.zeroq.ru" = { "collabora.zeroq.ru" = {
# enableACME = true; enableACME = true;
# forceSSL = true; forceSSL = true;
# locations."/" = { kTLS = true;
# proxyPass = "http://${server}:8080"; locations."/" = {
# proxyWebsockets = true; # collabora uses websockets proxyPass = "http://${server}:9980";
# }; proxyWebsockets = true; # collabora uses websockets
# }; };
listen = [
{
addr = "0.0.0.0";
port = 443;
ssl = true;
}
};
extraConfig = ''
client_max_body_size 5G;
'';
};
"immich.zeroq.ru" = { "immich.zeroq.ru" = {
# 31.57.105.253 # 31.57.105.253
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations = { kTLS = true;
"/" = { locations."/" = {
proxyPass = "http://${server}:2283"; # Порт Immich proxyPass = "http://${server}:2283"; # Порт Immich
proxyWebsockets = true; # Если Immich использует WebSockets proxyWebsockets = true; # Если Immich использует WebSockets
};
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
@@ -41,6 +51,7 @@ in
"nextcloud.zeroq.ru" = { "nextcloud.zeroq.ru" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
kTLS = true;
locations."/" = { locations."/" = {
proxyPass = "http://${server}:10000"; # Порт Nextcloud proxyPass = "http://${server}:10000"; # Порт Nextcloud
proxyWebsockets = true; proxyWebsockets = true;
@@ -52,6 +63,7 @@ in
"flux.zeroq.ru" = { "flux.zeroq.ru" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
kTLS = true;
locations."/" = { locations."/" = {
proxyPass = "http://${server}:6061"; # Порт Nextcloud proxyPass = "http://${server}:6061"; # Порт Nextcloud
proxyWebsockets = true; proxyWebsockets = true;
@@ -63,6 +75,7 @@ in
"calibre.zeroq.ru" = { "calibre.zeroq.ru" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
kTLS = true;
locations."/" = { locations."/" = {
proxyPass = "http://${server}:8083"; # Порт Nextcloud proxyPass = "http://${server}:8083"; # Порт Nextcloud
proxyWebsockets = true; proxyWebsockets = true;
@@ -74,6 +87,7 @@ in
"pdf.zeroq.ru" = { "pdf.zeroq.ru" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
kTLS = true;
locations."/" = { locations."/" = {
proxyPass = "http://${server}:6060"; # Порт Nextcloud proxyPass = "http://${server}:6060"; # Порт Nextcloud
proxyWebsockets = true; proxyWebsockets = true;