From 3561b6d86c329272b1825adaf3ca49c9aff76119 Mon Sep 17 00:00:00 2001
From: Thomas Vanbesien <tvanbesi@proton.me>
Date: Thu, 12 Feb 2026 21:24:22 +0100
Subject: Refactor

- Remove cgit files; pull cgit image from Docker Hub instead of building
locally
- Tidy up file hierarchy
- Minor fixes and edits
---
 services/radicale/Dockerfile               |  3 ---
 services/radicale/etc/radicale/conf.ini    | 14 +++++++++++++
 services/radicale/fs/etc/radicale/conf.ini | 14 -------------
 services/radicale/fs/sbin/cmd.sh           | 33 ------------------------------
 services/radicale/sbin/cmd.sh              | 33 ++++++++++++++++++++++++++++++
 5 files changed, 47 insertions(+), 50 deletions(-)
 delete mode 100644 services/radicale/Dockerfile
 create mode 100644 services/radicale/etc/radicale/conf.ini
 delete mode 100644 services/radicale/fs/etc/radicale/conf.ini
 delete mode 100755 services/radicale/fs/sbin/cmd.sh
 create mode 100755 services/radicale/sbin/cmd.sh

(limited to 'services/radicale')

diff --git a/services/radicale/Dockerfile b/services/radicale/Dockerfile
deleted file mode 100644
index d6e850b..0000000
--- a/services/radicale/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM tomsquest/docker-radicale:3.5.10.0
-ADD fs.tar.gz /
-CMD su-exec radicale /sbin/cmd.sh
diff --git a/services/radicale/etc/radicale/conf.ini b/services/radicale/etc/radicale/conf.ini
new file mode 100644
index 0000000..2af4af9
--- /dev/null
+++ b/services/radicale/etc/radicale/conf.ini
@@ -0,0 +1,14 @@
+[server]
+
+hosts = localhost:5232, radicale:5232
+
+[auth]
+
+type = htpasswd
+htpasswd_filename = /etc/radicale/users/.htpasswd
+htpasswd_encryption = bcrypt
+
+[storage]
+
+filesystem_folder = /data/collections
+hook = git add -A && (git diff --cached --quiet || git commit -m "Changes by \"%(user)s\"")
diff --git a/services/radicale/fs/etc/radicale/conf.ini b/services/radicale/fs/etc/radicale/conf.ini
deleted file mode 100644
index 2af4af9..0000000
--- a/services/radicale/fs/etc/radicale/conf.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[server]
-
-hosts = localhost:5232, radicale:5232
-
-[auth]
-
-type = htpasswd
-htpasswd_filename = /etc/radicale/users/.htpasswd
-htpasswd_encryption = bcrypt
-
-[storage]
-
-filesystem_folder = /data/collections
-hook = git add -A && (git diff --cached --quiet || git commit -m "Changes by \"%(user)s\"")
diff --git a/services/radicale/fs/sbin/cmd.sh b/services/radicale/fs/sbin/cmd.sh
deleted file mode 100755
index 4d09e75..0000000
--- a/services/radicale/fs/sbin/cmd.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-set -eu
-
-conf=/etc/radicale/conf.ini
-
-if [ ! -d /data/collections/.git ]; then
-	# Initialize git repository (for storage)
-	echo "Starting server..."
-	/venv/bin/radicale --config "$conf" --logging-level error &
-	radicale_pid=$!
-	echo "Waiting for server to start..."
-	until curl -sf http://127.0.0.1:5232; do sleep 1; done
-	echo "Server started"
-
-	cd /data/collections
-	git init --initial-branch=radicale
-	git config user.name radicale
-	git config user.email radicale@domain.tld
-	cat <<EOF >.gitignore
-.Radicale.cache
-.Radicale.lock
-.Radicale.tmp-*
-EOF
-	git add -A && (git diff --cached --quiet || git commit -m "Initialization commit")
-
-	echo "Restarting server..."
-	kill "$radicale_pid"
-	wait "$radicale_pid"
-else
-	echo "Initialization skipped"
-fi
-
-exec /venv/bin/radicale --config "$conf"
diff --git a/services/radicale/sbin/cmd.sh b/services/radicale/sbin/cmd.sh
new file mode 100755
index 0000000..4d09e75
--- /dev/null
+++ b/services/radicale/sbin/cmd.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -eu
+
+conf=/etc/radicale/conf.ini
+
+if [ ! -d /data/collections/.git ]; then
+	# Initialize git repository (for storage)
+	echo "Starting server..."
+	/venv/bin/radicale --config "$conf" --logging-level error &
+	radicale_pid=$!
+	echo "Waiting for server to start..."
+	until curl -sf http://127.0.0.1:5232; do sleep 1; done
+	echo "Server started"
+
+	cd /data/collections
+	git init --initial-branch=radicale
+	git config user.name radicale
+	git config user.email radicale@domain.tld
+	cat <<EOF >.gitignore
+.Radicale.cache
+.Radicale.lock
+.Radicale.tmp-*
+EOF
+	git add -A && (git diff --cached --quiet || git commit -m "Initialization commit")
+
+	echo "Restarting server..."
+	kill "$radicale_pid"
+	wait "$radicale_pid"
+else
+	echo "Initialization skipped"
+fi
+
+exec /venv/bin/radicale --config "$conf"
-- 
cgit v1.2.3