diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/container.mk | 1 | ||||
| -rw-r--r-- | make/openrc.mk | 2 | ||||
| -rw-r--r-- | make/vars.mk | 2 |
3 files changed, 4 insertions, 1 deletions
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 \ |