move docker files under core

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: |

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 \

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]