diff --git a/nixosModules/server/default.nix b/nixosModules/server/default.nix index fe96454..86ff23c 100755 --- a/nixosModules/server/default.nix +++ b/nixosModules/server/default.nix @@ -8,8 +8,8 @@ # ./open-webui.nix ../software/beets ./calibre-web.nix - ./memos.nix - #./trilium.nix + # ./memos.nix + # ./trilium.nix ./immich.nix ./mealie.nix ./miniflux.nix diff --git a/nixosModules/server/immich.nix b/nixosModules/server/immich.nix index 26517e9..487bf2e 100755 --- a/nixosModules/server/immich.nix +++ b/nixosModules/server/immich.nix @@ -6,13 +6,9 @@ xlib, ... }: -# let -# pkgsn = import inputs.nixpkgs-master { system = "x86_64-linux"; }; -# in { services = { immich = { - #package = pkgsn.immich; # inputs.self.packages.x86_64-linux.immich; enable = true; port = 2283; host = "0.0.0.0"; @@ -37,7 +33,7 @@ }; systemd.tmpfiles.rules = [ - "z /mnt/immich 0755 immich immich -" # beets absolute paths + "z /mnt/immich 0755 immich immich -" ]; users.users.immich.extraGroups = [ diff --git a/nixosModules/server/mealie.nix b/nixosModules/server/mealie.nix index 5c3a92e..c386830 100755 --- a/nixosModules/server/mealie.nix +++ b/nixosModules/server/mealie.nix @@ -4,8 +4,12 @@ }: { services.mealie = { - enable = false; + enable = true; listenAddress = "0.0.0.0"; port = 9000; + database.createLocally = true; + settings = { + ALLOW_SIGNUP = "true"; + }; }; } diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index 56ed37b..513f7a2 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -16,64 +16,68 @@ in recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { - "office.zeroq.ru" = { - enableACME = true; + "zeroq.ru" = { forceSSL = true; - kTLS = true; - locations."/" = { - proxyPass = "http://${server}:8080"; - proxyWebsockets = true; # onlyoffice uses websockets - }; - extraConfig = '' - client_max_body_size 5G; - absolute_redirect off; - ''; - }; - "collabora.zeroq.ru" = { enableACME = true; - forceSSL = true; kTLS = true; - locations."/" = { - proxyPass = "http://${server}:9980"; - proxyWebsockets = true; - }; - #proxy_set_header X-Forwarded-Proto https; - extraConfig = '' - client_max_body_size 5G; - ''; - }; - "memos.zeroq.ru" = { - enableACME = true; - forceSSL = true; - kTLS = true; - locations."/" = { - proxyPass = "http://${server}:5230"; - proxyWebsockets = true; - }; - extraConfig = '' - client_max_body_size 5G; - ''; - }; - "trilium.zeroq.ru" = { - enableACME = true; - forceSSL = true; - kTLS = true; - locations."/" = { - proxyPass = "http://${server}:11000"; - proxyWebsockets = true; + locations = { + "/mealie" = { + proxyPass = "http://${server}:9000"; + proxyWebsockets = true; + }; + "/memos" = { + proxyPass = "http://${server}:5230"; + proxyWebsockets = true; + }; + "/trilium" = { + proxyPass = "http://${server}:11000"; + proxyWebsockets = true; + }; + "/flux" = { + proxyPass = "http://${server}:6061"; + proxyWebsockets = true; + }; + "/calibre" = { + proxyPass = "http://${server}:8083"; + proxyWebsockets = true; + }; + "/pdf" = { + proxyPass = "http://${server}:6060"; + proxyWebsockets = true; + }; + "/immich" = { + proxyPass = "http://${server}:2283"; + proxyWebsockets = true; + }; + "/nextcloud" = { + proxyPass = "http://${server}:10000"; + proxyWebsockets = true; + }; }; extraConfig = '' client_max_body_size 5G; ''; }; + # "office.zeroq.ru" = { + # enableACME = true; + # forceSSL = true; + # kTLS = true; + # locations."/" = { + # proxyPass = "http://${server}:8080"; + # proxyWebsockets = true; + # }; + # extraConfig = '' + # client_max_body_size 5G; + # absolute_redirect off; + # ''; + # }; "immich.zeroq.ru" = { - # 31.57.105.253 forceSSL = true; enableACME = true; kTLS = true; locations."/" = { - proxyPass = "http://${server}:2283"; # Порт Immich - proxyWebsockets = true; # Если Immich использует WebSockets + proxyPass = "http://${server}:2283"; + proxyWebsockets = true; }; extraConfig = '' client_max_body_size 5G; @@ -84,19 +88,7 @@ in enableACME = true; kTLS = true; locations."/" = { - proxyPass = "http://${server}:10000"; # Порт Nextcloud - proxyWebsockets = true; - }; - extraConfig = '' - client_max_body_size 5G; - ''; - }; - "flux.zeroq.ru" = { - forceSSL = true; - enableACME = true; - kTLS = true; - locations."/" = { - proxyPass = "http://${server}:6061"; # Порт Nextcloud + proxyPass = "http://${server}:10000"; proxyWebsockets = true; }; extraConfig = '' @@ -108,7 +100,7 @@ in enableACME = true; kTLS = true; locations."/" = { - proxyPass = "http://${server}:8083"; # Порт Nextcloud + proxyPass = "http://${server}:8083"; proxyWebsockets = true; }; extraConfig = '' @@ -120,7 +112,7 @@ in enableACME = true; kTLS = true; locations."/" = { - proxyPass = "http://${server}:6060"; # Порт Nextcloud + proxyPass = "http://${server}:6060"; proxyWebsockets = true; }; extraConfig = '' @@ -131,7 +123,7 @@ in # addSSL = true; # enableACME = true; # locations."/" = { - # proxyPass = "http://atoridu.laxta-platy.ts.net:11111"; # Порт Open WebUI + # proxyPass = "http://atoridu.laxta-platy.ts.net:11111"; # proxyWebsockets = true; # }; # };