diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index fbc25fa..92f183e 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -17,7 +17,7 @@ in nextcloud-whiteboard-server = { enable = true; settings = { - NEXTCLOUD_URL = "https://nextcloud.local"; + NEXTCLOUD_URL = "http://nextcloud.local"; }; secrets = [ "${inputs.zeroq-credentials}/services/nextcloud/jwt-secret.txt" ]; }; diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix index f86a875..663929c 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -26,10 +26,20 @@ port = 10000; } ]; - locations."/whiteboard" = { - proxyPass = "http://localhost:3002"; - proxyWebsockets = true; - }; + }; + "localhost:3002" = { + forceSSL = false; + enableACME = false; + listen = [ + { + addr = "100.64.0.0"; + port = 3002; + } + { + addr = "192.168.1.20"; + port = 3002; + } + ]; }; # "trilium" = { # forceSSL = false; @@ -45,20 +55,20 @@ # } # ]; # }; - "office.zeroq.ru" = { - forceSSL = false; - enableACME = false; - locations."/" = { - proxyPass = "http://onlyoffice.local:8000"; - proxyWebsockets = true; - }; - extraConfig = '' - # Force nginx to return relative redirects. This lets the browser - # figure out the full URL. This ends up working better because it's in - # front of the reverse proxy and has the right protocol, hostname & port. - absolute_redirect off; - ''; - }; + # "office.zeroq.ru" = { + # forceSSL = false; + # enableACME = false; + # locations."/" = { + # proxyPass = "http://onlyoffice.local:8000"; + # proxyWebsockets = true; + # }; + # extraConfig = '' + # # Force nginx to return relative redirects. This lets the browser + # # figure out the full URL. This ends up working better because it's in + # # front of the reverse proxy and has the right protocol, hostname & port. + # absolute_redirect off; + # ''; + # }; # "onlyoffice.local" = { # forceSSL = false; # enableACME = false; diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix index b280b73..dc47381 100755 --- a/nixosModules/vds/nginx.nix +++ b/nixosModules/vds/nginx.nix @@ -38,8 +38,7 @@ in }; extraConfig = '' client_max_body_size 5G; - absolute_redirect off; - ''; + ''; # absolute_redirect off; }; "immich.zeroq.ru" = { forceSSL = true; @@ -57,9 +56,19 @@ in forceSSL = true; enableACME = true; kTLS = true; - locations."/" = { - proxyPass = "http://${server}:10000"; - proxyWebsockets = true; + locations = { + "/" = { + proxyPass = "http://${server}:10000"; + proxyWebsockets = true; + }; + "/whiteboard" = { + proxyPass = "http://${server}:3002"; + proxyWebsockets = true; + }; + "/onlyoffice" = { + proxyPass = "http://${server}:8000"; + proxyWebsockets = true; + }; }; extraConfig = '' client_max_body_size 5G;