From d31ea4b73afda0c1a5cf4212b783d6e62b0a9823 Mon Sep 17 00:00:00 2001
From: Benoit Donneaux <benoit@leastauthority.com>
Date: Wed, 29 May 2024 10:10:54 +0200
Subject: [PATCH] Ensure Trac directory structure can be used by docker-compose

Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
---
 docker-compose.yml        | 11 ++++++-----
 trac/{ => log}/.gitkeep   |  0
 trac/public_html/.gitkeep |  0
 trac/repos/.gitkeep       |  0
 trac/tahoe-lafs/.gitkeep  |  0
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename trac/{ => log}/.gitkeep (100%)
 create mode 100644 trac/public_html/.gitkeep
 create mode 100644 trac/repos/.gitkeep
 create mode 100644 trac/tahoe-lafs/.gitkeep

diff --git a/docker-compose.yml b/docker-compose.yml
index aa47d0f..f491dcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,11 @@ services:
         uid: "${_UID:-1000}"
         gid: "${_GID:-1000}"
     volumes:
-      - ./trac:/var/lib/appdata
-      - ./trac/public_html:/trac/chrome
-      - ./trac/repos:/home/sources/git
+      - ./trac/tahoe-lafs:/var/lib/appdata/tahoe-lafs
+      - ./trac/public_html:/var/lib/appdata/tahoe-lafs/htdocs
+      - ./trac/log:/var/lib/appdata/tahoe-lafs/log
+      - ./trac/trac.htdigest:/home/trac/trac.htdigest
+      - ./trac/repos:/home/source/git
     working_dir: /var/lib/appdata
     stdin_open: true
     tty: true
@@ -21,8 +23,7 @@ services:
     container_name: trac.local
     ports:
       - "${TRAC_PORT:-8000}:${TRAC_PORT:-8000}/tcp"
-    #command: /bin/bash
-    command: tracd --port ${TRAC_PORT:-8000} --auth="Tahoe-LAFS,./Tahoe-LAFS/conf/user_passwd,tahoe-lafs.org" ./Tahoe-LAFS
+    command: tracd --port ${TRAC_PORT:-8000} ./tahoe-lafs
     network_mode: "bridge"
     # Prevents container to hang the host
     # Requires `... --compatibility run ...`
diff --git a/trac/.gitkeep b/trac/log/.gitkeep
similarity index 100%
rename from trac/.gitkeep
rename to trac/log/.gitkeep
diff --git a/trac/public_html/.gitkeep b/trac/public_html/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/trac/repos/.gitkeep b/trac/repos/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/trac/tahoe-lafs/.gitkeep b/trac/tahoe-lafs/.gitkeep
new file mode 100644
index 0000000..e69de29