From fd1d9837cad3bbe0331eaf86722acadf631a196a Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Sat, 21 Mar 2026 11:38:10 +0100 Subject: [PATCH] Update APP_URL to use HTTP for Pelican configuration and adjust Caddyfile path in Docker setup --- .../modules/songsheet/wavelog/docker-compose.nix | 4 ++-- .../modules/songsheet/wavelog/docker-compose.yml | 2 +- nix-system-configs/modules/system/minecraft.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix index f99a7e0..d43d178 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix @@ -86,12 +86,12 @@ image = "ghcr.io/pelican-dev/panel:latest"; environment = { "ADMIN_EMAIL" = "kuutruu@posteo.net"; - "APP_URL" = "http://localhost"; + "APP_URL" = "http://pelican.prg-radio.org"; "TRUSTED_PROXIES" = "10.1.1.250"; "XDG_DATA_HOME" = "/pelican-data"; }; volumes = [ - "nix-system-configs/modules/songsheet/wavelog/Caddyfile:/etc/caddy/Caddyfile:rw" + "/etc/pelican/Caddyfile:/etc/caddy/Caddyfile:ro" "wavelog_pelican-data:/pelican-data:rw" "wavelog_pelican-logs:/var/www/html/storage/logs:rw" ]; diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml index 852cad5..6809808 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml @@ -106,7 +106,7 @@ services: - pelican-logs:/var/www/html/storage/logs environment: XDG_DATA_HOME: /pelican-data - APP_URL: "https://pelican.prg-radio.org" + APP_URL: "http://pelican.prg-radio.org" ADMIN_EMAIL: "kuutruu@posteo.net" TRUSTED_PROXIES: "10.1.1.250" diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index 0b87d3a..c351631 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -56,7 +56,7 @@ in { # Install psql services.postgresql = { - enable = true; + enable = true; }; # --------------------------------------------------------------------------- # Minecraft server configuration (nix-minecraft)