From c62f30ec324a511989c80240ebb21bb8c6423eec Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Fri, 3 Jul 2026 10:06:10 +0100
Subject: [PATCH] adds missing space in openrc.mk

---
 compose.yml       | 2 +-
 make/container.mk | 1 +
 make/openrc.mk    | 2 +-
 make/vars.mk      | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index 8a8c6fe..a87243c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -74,7 +74,7 @@ services:
     environment:
       DOMAIN: "https://pwd.joeac.net"
     volumes:
-      - ./vaultwarden/vw-data/:/data/
+      - ${VAULTWARDEN_DATA_DIR}:/data/
     ports:
       - "${VAULTWARDEN_PORT}:80"
 
diff --git a/make/container.mk b/make/container.mk
index b2918a2..9608925 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)" \
+	VAULTWARDEN_DATA_DIR="$(VAULTWARDEN_DATA_DIR)" \
 	LOCAL_SMTP_PORT=$(PORT_smtp) \
 	$(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \
 	podman-compose
diff --git a/make/openrc.mk b/make/openrc.mk
index d3cceee..85bdc3e 100644
--- a/make/openrc.mk
+++ b/make/openrc.mk
@@ -65,7 +65,7 @@ $(foreach module,$(MODULES),$(eval $(openrc_restart_rule)))
 	sudo ln -s /etc/init.d/user /etc/init.d/user.$(USER)
 
 /etc/conf.d/user.$(USER): openrc/conf.d/user.template
-	sudo USER=$(USER)envsubst openrc/conf.d/user.template /etc/conf.d/user.$(USER)
+	sudo USER=$(USER) envsubst openrc/conf.d/user.template /etc/conf.d/user.$(USER)
 	sudo rc-update add user.$(USER) default
 
 .PHONY: uninstall_joeac.net_service
diff --git a/make/vars.mk b/make/vars.mk
index 2033a06..5411b98 100644
--- a/make/vars.mk
+++ b/make/vars.mk
@@ -29,6 +29,8 @@ PORT_vaultwarden := 9000
 
 PUBLIC_ROOT_DIR_ln := /var/ln.joeac.net/public
 
+VAULTWARDEN_DATA_DIR := /var/vaultwarden
+
 $(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \
 	export $(call capitalise,$(module))_PORT := $(PORT_$(module)))))
 $(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \