From 2d6fee9dd77a85f37ac1f09ced4b395dc047b664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allen-Kristjan=20P=C3=A4ll?= <akpall@fst.ee>
Date: Wed, 11 Feb 2026 05:18:26 +0200
Subject: [PATCH] move docker files under core

---
 config.yaml                               | 18 +++++++-----------
 files/{opt => }/caddy/etc/caddy/Caddyfile |  0
 files/docker-caddy.service                |  6 +++---
 files/docker-matrixdotorg-synapse.service |  4 ++--
 4 files changed, 12 insertions(+), 16 deletions(-)
 rename files/{opt => }/caddy/etc/caddy/Caddyfile (100%)

diff --git a/config.yaml b/config.yaml
index 9ab0fac..b63acff 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,17 +7,13 @@ passwd:
     - name: core
       ssh_authorized_keys:
         - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpw3cIAdtWOYUkb6UOAIcLuRzItoo4oZMzr/hzZYq4E openpgp:0xFAAA0172
-    - name: matrixdotorg-synapse
-      home_dir: /opt/matrixdotorg-synapse
-    - name: caddy
-      home_dir: /opt/caddy
 
 storage:
   directories:
-    - path: /opt/caddy/data
-    - path: /opt/caddy/etc/caddy
-    - path: /opt/caddy/var/www/html
-    - path: /opt/matrixdotorg-synapse/data
+    - path: /home/core/caddy/data
+    - path: /home/core/caddy/etc/caddy
+    - path: /home/core/caddy/var/www/html
+    - path: /home/core/matrixdotorg-synapse/data
     - path: /home/core/matrixdotorg-matrix-appservice-irc/data
   files:
     # hostname
@@ -32,11 +28,11 @@ storage:
       overwrite: true
       contents:
         local: etc/hosts
-    - path: /opt/caddy/etc/caddy/Caddyfile
+    - path: /home/core/caddy/etc/caddy/Caddyfile
       overwrite: true
       contents:
-        local: opt/caddy/etc/caddy/Caddyfile
-    - path: /opt/caddy/var/www/html/index.html
+        local: caddy/etc/caddy/Caddyfile
+    - path: /home/core/caddy/var/www/html/index.html
       overwrite: true
       contents:
         inline: |
diff --git a/files/opt/caddy/etc/caddy/Caddyfile b/files/caddy/etc/caddy/Caddyfile
similarity index 100%
rename from files/opt/caddy/etc/caddy/Caddyfile
rename to files/caddy/etc/caddy/Caddyfile
diff --git a/files/docker-caddy.service b/files/docker-caddy.service
index 2104d66..2992517 100644
--- a/files/docker-caddy.service
+++ b/files/docker-caddy.service
@@ -10,9 +10,9 @@ ExecStart=docker run \
   --name=caddy \
   --network=caddy-network \
   --rm \
-  --mount type=bind,src=/opt/caddy/etc/caddy,dst=/etc/caddy \
-  --mount type=bind,src=/opt/caddy/var/www/html,dst=/var/www/html \
-  --mount type=bind,src=/opt/caddy/data,dst=/data \
+  --mount type=bind,src=/home/core/caddy/etc/caddy,dst=/etc/caddy \
+  --mount type=bind,src=/home/core/caddy/var/www/html,dst=/var/www/html \
+  --mount type=bind,src=/home/core/caddy/data,dst=/data \
   -p 80:80 \
   -p 443:443 \
   -p 8448:8448 \
diff --git a/files/docker-matrixdotorg-synapse.service b/files/docker-matrixdotorg-synapse.service
index 1607a9b..465cc19 100644
--- a/files/docker-matrixdotorg-synapse.service
+++ b/files/docker-matrixdotorg-synapse.service
@@ -10,7 +10,7 @@ ExecStartPre=/usr/bin/docker run \
   --name=matrixdotorg-synapse \
   --network=caddy-network \
   --rm \
-  --mount type=bind,src=/opt/matrixdotorg-synapse/data,dst=/data \
+  --mount type=bind,src=/home/core/matrixdotorg-synapse/data,dst=/data \
   -e SYNAPSE_SERVER_NAME=matrix.fst.ee \
   -e SYNAPSE_REPORT_STATS=yes \
   matrixdotorg/synapse:latest generate
@@ -18,7 +18,7 @@ ExecStart=docker run \
   --name=matrixdotorg-synapse \
   --network=caddy-network \
   --rm \
-  --mount type=bind,src=/opt/matrixdotorg-synapse/data,dst=/data \
+  --mount type=bind,src=/home/core/matrixdotorg-synapse/data,dst=/data \
   matrixdotorg/synapse:latest
 
 [Install]