From c71c3b8ed2c2f16d42c5cec88653d9577bde8b1e Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Mon, 17 Nov 2025 16:33:43 -0600 Subject: [PATCH] stuff --- .../nixos/services/nextcloud/container.nix | 16 ++++++------ modules/nixos/services/onlyoffice/default.nix | 2 +- modules/nixos/services/traefik/default.nix | 26 ++++++++++++------- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/modules/nixos/services/nextcloud/container.nix b/modules/nixos/services/nextcloud/container.nix index ac36216..05e5642 100755 --- a/modules/nixos/services/nextcloud/container.nix +++ b/modules/nixos/services/nextcloud/container.nix @@ -29,7 +29,7 @@ in config = mkIf cfg.enable { containers.nextcloud = { - autoStart = true; + autoStart = false; privateNetwork = true; hostAddress = hostAddress; localAddress = localAddress; @@ -81,16 +81,16 @@ in ${hostAddress} host.containers protonmail-bridge ''; - services.nginx.virtualHosts."cloud.mjallen.dev".listen = [ - { - addr = "0.0.0.0"; - port = 8080; - } - ]; +# services.nginx.virtualHosts."cloud.mjallen.dev".listen = [ +# { +# addr = "0.0.0.0"; +# port = 8080; +# } +# ]; services = { nextcloud = { - enable = true; + enable = false; package = pkgs.nextcloud32; # datadir = "/data"; database.createLocally = true; diff --git a/modules/nixos/services/onlyoffice/default.nix b/modules/nixos/services/onlyoffice/default.nix index c831fc4..bd4898b 100644 --- a/modules/nixos/services/onlyoffice/default.nix +++ b/modules/nixos/services/onlyoffice/default.nix @@ -16,7 +16,7 @@ in }; config = lib.mkIf cfg.enable { - #services.nginx.virtualHosts."office.mjallen.dev".listen = [ { addr = "0.0.0.0"; port = 9943; } ]; + services.nginx.virtualHosts."office.mjallen.dev".listen = [ { addr = "0.0.0.0"; port = 9943; } ]; services.onlyoffice = { enable = true; port = 9943; diff --git a/modules/nixos/services/traefik/default.nix b/modules/nixos/services/traefik/default.nix index ceb06ce..e252016 100755 --- a/modules/nixos/services/traefik/default.nix +++ b/modules/nixos/services/traefik/default.nix @@ -262,6 +262,14 @@ in # }; http = { + + serversTransports = { + attich1 = { + serverName = "localhost"; + disableHTTP2 = true; + }; + }; + middlewares = { authentik = { forwardAuth = { @@ -365,11 +373,14 @@ in url = authentikUrl; } ]; - cache.loadBalancer.servers = [ - { - url = cacheUrl; - } - ]; + cache.loadBalancer = { + servers = [ + { + url = cacheUrl; + } + ]; + serversTransport = "attich1"; + }; chat.loadBalancer.servers = [ { url = openWebUIUrl; @@ -479,10 +490,7 @@ in entryPoints = [ "websecure" ]; rule = "Host(`cache.${domain}`)"; service = "cache"; - middlewares = [ - "crowdsec" - "whitelist-geoblock" - ]; + middlewares = [ ]; priority = 10; tls.certResolver = "letsencrypt"; };