From 245e664bd6caa9c1bda64db69b78a60e3b4dba81 Mon Sep 17 00:00:00 2001
From: Christine Elisabeth Koppel <kuutruu@posteo.net>
Date: Sat, 21 Mar 2026 14:28:43 +0100
Subject: [PATCH] Update Docker and Nix configurations for Pelican Wings
 service

---
 .../modules/songsheet/wavelog/docker-compose.nix             | 4 ++--
 .../modules/songsheet/wavelog/docker-compose.yml             | 4 ++--
 nix-system-configs/modules/system/compose-songsheet.nix      | 5 +++++
 3 files changed, 9 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 6bce791..f5525a5 100644
--- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix
+++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix
@@ -138,11 +138,11 @@
     volumes = [
       "/etc/pelican/:/etc/pelican:rw"
       "/etc/ssl/certs:/etc/ssl/certs:ro"
+      "/run/podman/podman.sock:/var/run/docker.sock:rw"
       "/tmp/pelican/:/tmp/pelican:rw"
-      "/var/lib/docker/containers/:/var/lib/docker/containers:rw"
+      "/var/lib/containers/storage/overlay-containers/:/var/lib/docker/containers:rw"
       "/var/lib/pelican/:/var/lib/pelican:rw"
       "/var/log/pelican/:/var/log/pelican:rw"
-      "/var/run/docker.sock:/var/run/docker.sock:rw"
     ];
     ports = [
       "2022:2022/tcp"
diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml
index 208b23f..3280203 100644
--- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml
+++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml
@@ -127,8 +127,8 @@ services:
       WINGS_GID: 1000
       WINGS_USERNAME: pelican
     volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-      - "/var/lib/docker/containers/:/var/lib/docker/containers/"
+      - "/run/podman/podman.sock:/var/run/docker.sock"
+      - "/var/lib/containers/storage/overlay-containers/:/var/lib/docker/containers/"
       - "/etc/pelican/:/etc/pelican/"
       - "/var/lib/pelican/:/var/lib/pelican/"
       - "/var/log/pelican/:/var/log/pelican/"
diff --git a/nix-system-configs/modules/system/compose-songsheet.nix b/nix-system-configs/modules/system/compose-songsheet.nix
index c36d378..90c3477 100644
--- a/nix-system-configs/modules/system/compose-songsheet.nix
+++ b/nix-system-configs/modules/system/compose-songsheet.nix
@@ -68,5 +68,10 @@ in {
     ];
 
     system.stateVersion = "25.11";
+
+    systemd.tmpfiles.rules = [
+      "d /var/lib/pelican 0755 root root -"
+      "d /var/log/pelican 0755 root root -"
+    ];
   };
 }