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-23 22:12:38 +03:00
parent df659b8a4c
commit 7475939293
5 changed files with 73 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixosModules/server/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@
../software/beets ../software/beets
./calibre-web.nix ./calibre-web.nix
./memos.nix ./memos.nix
./trilium.nix #./trilium.nix
./immich.nix ./immich.nix
./mealie.nix ./mealie.nix
./miniflux.nix ./miniflux.nix
nixosModules/server/nextcloud.nix
+42 -41
View File
@@ -102,13 +102,14 @@ in
listen = "0.0.0.0"; listen = "0.0.0.0";
post_allow.host = [ post_allow.host = [
"localhost" "localhost"
"100.64.0.0"
"127.0.0.1" "127.0.0.1"
"0.0.0.0"
"nextcloud.zeroq.ru"
]; # "::1" ]; # "::1"
}; };
storage.wopi = { storage.wopi = {
"@allow" = true; "@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; #rabbitmq.enable = false;
}; };
networking.hosts = { # networking.hosts = {
"127.0.0.1" = [ # "127.0.0.1" = [
"nextcloud.zeroq.ru" # "nextcloud.zeroq.ru"
"office.zeroq.com" # "collabora.zeroq.ru"
"collabora.zeroq.ru" # # "office.zeroq.com"
]; # ];
"::1" = [ # "::1" = [
"nextcloud.zeroq.ru" # "nextcloud.zeroq.ru"
"collabora.zeroq.ru" # "collabora.zeroq.ru"
"office.zeroq.com" # # "office.zeroq.com"
]; # ];
}; # };
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://127.0.0.1:${toString config.services.collabora-online.port}"; # wopi_url = "http://127.0.0.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
+28 -36
View File
@@ -27,28 +27,20 @@
} }
]; ];
}; };
"trilium" = { # "trilium" = {
forceSSL = false; # forceSSL = false;
enableACME = false; # enableACME = false;
listen = [ # listen = [
{ # {
addr = "100.64.0.0"; # addr = "100.64.0.0";
port = 11000; # port = 11000;
} # }
{ # {
addr = "192.168.1.20"; # addr = "192.168.1.20";
port = 11000; # port = 11000;
} # }
# { # ];
# addr = "0.0.0.0"; # };
# port = 80;
# }
# {
# addr = "0.0.0.0";
# port = 443;
# }
];
};
# "onlyoffice" = { # "onlyoffice" = {
# forceSSL = false; # forceSSL = false;
# enableACME = false; # enableACME = false;
@@ -63,20 +55,20 @@
# } # }
# ]; # ];
# }; # };
# "localhost:9980" = { "localhost:9980" = {
# forceSSL = false; forceSSL = false;
# enableACME = false; enableACME = false;
# listen = [ listen = [
# { {
# addr = "100.64.0.0"; addr = "100.64.0.0";
# port = 9980; port = 9980;
# } }
# { {
# addr = "192.168.1.20"; addr = "192.168.1.20";
# port = 9980; port = 9980;
# } }
# ]; ];
# }; };
# "localhost:5230" = { # "localhost:5230" = {
# forceSSL = false; # forceSSL = false;
# enableACME = false; # enableACME = false;
nixosModules/server/trilium.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}: }:
{ {
services.trilium-server = { services.trilium-server = {
enable = true; enable = false;
nginx = { nginx = {
enable = true; enable = true;
hostName = "trilium"; hostName = "trilium";
nixosModules/vds/nginx.nix
+1 -8
View File
@@ -34,15 +34,8 @@ in
kTLS = true; kTLS = true;
locations."/" = { locations."/" = {
proxyPass = "http://${server}:9980"; 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; #proxy_set_header X-Forwarded-Proto https;
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;