From cada6f46726e044d5752d433f4cd220563717550 Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Mon, 23 Mar 2026 02:29:19 +0100 Subject: [PATCH] Derp --- .../modules/songsheet/wavelog/docker-compose.nix | 2 +- .../modules/songsheet/wavelog/docker-compose.yml | 4 ++-- nix-system-configs/modules/system/traefik.nix | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix index b842188..4ff4be8 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix @@ -148,7 +148,7 @@ "8080:8080/tcp" "2022:2022/tcp" ]; - cmd = ["wings" "--ignore-certificate-errors" "--debug"]; + cmd = ["wings" "--ignore-certificate-errors"]; log-driver = "journald"; extraOptions = [ "--network-alias=wings" diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml index 516b02f..f82b7eb 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml @@ -115,10 +115,10 @@ services: container_name: pelican_wings restart: unless-stopped ports: - - "8080:8080" + - "8443:8443" - "2022:2022" stdin_open: true - command: ["wings", "--ignore-certificate-errors", "--debug"] + command: ["wings", "--ignore-certificate-errors"] tty: true environment: TZ: Europe/Copenhagen diff --git a/nix-system-configs/modules/system/traefik.nix b/nix-system-configs/modules/system/traefik.nix index 20212eb..35e44ee 100644 --- a/nix-system-configs/modules/system/traefik.nix +++ b/nix-system-configs/modules/system/traefik.nix @@ -497,12 +497,10 @@ in { passHostHeader = true; }; - wings-pelican.loadBalancer = { - servers = [ - {url = "http://10.1.1.249:8080";} - ]; + servers = [ { url = "https://10.1.1.249:8443"; } ]; passHostHeader = true; + serversTransport = "wings-transport"; }; # Mail JMAP HTTP backend @@ -1017,8 +1015,9 @@ in { }; }; - networking.firewall.allowedTCPPorts = [80 443 10022 30033 8448 9001 3001 993 465 25 25565 24454]; - networking.firewall.allowedUDPPorts = [80 443 9987 9001 3001 993 465 25 25565 24454]; + # Allow common HTTP/S and control ports, + networking.firewall.allowedTCPPorts = [80 443 10022 30033 8448 9001 3001 993 465 25 25565 24454 2456 2457 2458 26000 1234 3979 2022]; + networking.firewall.allowedUDPPorts = [80 443 9987 9001 3001 993 465 25 25565 24454 2022 2456 2457 2458 26000 1234 3979 2022]; system.stateVersion = "25.11"; };