From 0074ad66432e41f331cd99bf24331e210f14fd22 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Fri, 3 Jul 2026 10:12:49 +0100
Subject: [PATCH] pulls out ETHERPAD_DATA_DIR

---
 compose.yml       | 2 +-
 make/container.mk | 1 +
 make/vars.mk      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index a87243c..66e7f9f 100644
--- a/compose.yml
+++ b/compose.yml
@@ -39,7 +39,7 @@ services:
         ALPINE_VERSION: ${ALPINE_VERSION}
         ETHERPAD_VERSION: ${ETHERPAD_VERSION}
     volumes:
-      - ./etherpad/var:/var/app/var
+      - ${ETHERPAD_DATA_DIR}:/var/app/var
     environment:
       NODE_ENV: ${ETHERPAD_NODE_ENV}
       ADMIN_PASSWORD: ${ETHERPAD_ADMIN_PASSWORD}
diff --git a/make/container.mk b/make/container.mk
index 9608925..a09c9ae 100644
--- a/make/container.mk
+++ b/make/container.mk
@@ -4,6 +4,7 @@ CPU_ARCH := $(if $(shell which arch 2>/dev/null),\
 IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/)
 COMPOSE_CMD := \
 	IMAGE_PREFIX="$(IMAGE_PREFIX)" \
+	ETHERPAD_DATA_DIR="$(ETHERPAD_DATA_DIR)" \
 	VAULTWARDEN_DATA_DIR="$(VAULTWARDEN_DATA_DIR)" \
 	LOCAL_SMTP_PORT=$(PORT_smtp) \
 	$(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \
diff --git a/make/vars.mk b/make/vars.mk
index c1c2db1..5ad9090 100644
--- a/make/vars.mk
+++ b/make/vars.mk
@@ -29,6 +29,7 @@ PORT_vaultwarden := 9000
 
 PUBLIC_ROOT_DIR_ln := /var/ln.joeac.net/public
 
+export ETHERPAD_DATA_DIR := /var/etherpad/var
 export VAULTWARDEN_DATA_DIR := /var/vaultwarden
 
 $(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \