diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix index 00cf38a..ce3f8ac 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix @@ -85,9 +85,8 @@ virtualisation.oci-containers.containers."pelican_panel" = { image = "ghcr.io/pelican-dev/panel:latest"; environment = { - "APP_URL" = "https://pelican.prg-radio.org"; - "BEHIND_PROXY" = "true"; - "LE_EMAIL" = "kuutruu@posteo.net"; + "ADMIN_EMAIL" = "kuutruu@posteo.net"; + "APP_URL" = "http://pelican.prg-radio.org"; "TRUSTED_PROXIES" = "10.1.1.250"; "XDG_DATA_HOME" = "/pelican-data"; }; @@ -131,7 +130,6 @@ image = "ghcr.io/pelican-dev/wings:latest"; environment = { "APP_TIMEZONE" = "Europe/Copenhagen"; - "BEHIND_PROXY" = "true"; "TZ" = "Europe/Copenhagen"; "WINGS_GID" = "1000"; "WINGS_UID" = "1000"; diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml index c351771..f82b7eb 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml @@ -106,10 +106,9 @@ services: - pelican-logs:/var/www/html/storage/logs environment: XDG_DATA_HOME: /pelican-data - APP_URL: "https://pelican.prg-radio.org" - LE_EMAIL: "kuutruu@posteo.net" + APP_URL: "http://pelican.prg-radio.org" + ADMIN_EMAIL: "kuutruu@posteo.net" TRUSTED_PROXIES: "10.1.1.250" - BEHIND_PROXY: true wings: image: ghcr.io/pelican-dev/wings:latest @@ -127,7 +126,6 @@ services: WINGS_UID: 1000 WINGS_GID: 1000 WINGS_USERNAME: pelican - BEHIND_PROXY: true # Just in case... volumes: - "/run/podman/podman.sock:/var/run/docker.sock" - "/var/lib/containers/storage/overlay-containers/:/var/lib/docker/containers/" diff --git a/nix-system-configs/modules/system/minecraft.nix b/nix-system-configs/modules/system/minecraft.nix index e03f7c5..f4eb32d 100644 --- a/nix-system-configs/modules/system/minecraft.nix +++ b/nix-system-configs/modules/system/minecraft.nix @@ -104,7 +104,7 @@ in { max-players = 128; online-mode = true; white-list = false; - spawn-protection = 0; + spawn-protection = 4; view-distance = 16; simulation-distance = 10; enable-command-block = false;