adds missing space in openrc.mk
This commit is contained in:
+1
-1
@@ -74,7 +74,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
DOMAIN: "https://pwd.joeac.net"
|
DOMAIN: "https://pwd.joeac.net"
|
||||||
volumes:
|
volumes:
|
||||||
- ./vaultwarden/vw-data/:/data/
|
- ${VAULTWARDEN_DATA_DIR}:/data/
|
||||||
ports:
|
ports:
|
||||||
- "${VAULTWARDEN_PORT}:80"
|
- "${VAULTWARDEN_PORT}:80"
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ CPU_ARCH := $(if $(shell which arch 2>/dev/null),\
|
|||||||
IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/)
|
IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/)
|
||||||
COMPOSE_CMD := \
|
COMPOSE_CMD := \
|
||||||
IMAGE_PREFIX="$(IMAGE_PREFIX)" \
|
IMAGE_PREFIX="$(IMAGE_PREFIX)" \
|
||||||
|
VAULTWARDEN_DATA_DIR="$(VAULTWARDEN_DATA_DIR)" \
|
||||||
LOCAL_SMTP_PORT=$(PORT_smtp) \
|
LOCAL_SMTP_PORT=$(PORT_smtp) \
|
||||||
$(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \
|
$(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \
|
||||||
podman-compose
|
podman-compose
|
||||||
|
|||||||
+1
-1
@@ -65,7 +65,7 @@ $(foreach module,$(MODULES),$(eval $(openrc_restart_rule)))
|
|||||||
sudo ln -s /etc/init.d/user /etc/init.d/user.$(USER)
|
sudo ln -s /etc/init.d/user /etc/init.d/user.$(USER)
|
||||||
|
|
||||||
/etc/conf.d/user.$(USER): openrc/conf.d/user.template
|
/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
|
sudo rc-update add user.$(USER) default
|
||||||
|
|
||||||
.PHONY: uninstall_joeac.net_service
|
.PHONY: uninstall_joeac.net_service
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ PORT_vaultwarden := 9000
|
|||||||
|
|
||||||
PUBLIC_ROOT_DIR_ln := /var/ln.joeac.net/public
|
PUBLIC_ROOT_DIR_ln := /var/ln.joeac.net/public
|
||||||
|
|
||||||
|
VAULTWARDEN_DATA_DIR := /var/vaultwarden
|
||||||
|
|
||||||
$(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \
|
$(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \
|
||||||
export $(call capitalise,$(module))_PORT := $(PORT_$(module)))))
|
export $(call capitalise,$(module))_PORT := $(PORT_$(module)))))
|
||||||
$(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \
|
$(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \
|
||||||
|
|||||||
Reference in New Issue
Block a user