diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/container.mk | 11 | ||||
| -rw-r--r-- | make/openrc.mk | 4 | ||||
| -rw-r--r-- | make/vars.mk | 12 |
3 files changed, 14 insertions, 13 deletions
diff --git a/make/container.mk b/make/container.mk index 189d9b4..323ef58 100644 --- a/make/container.mk +++ b/make/container.mk @@ -2,17 +2,6 @@ CPU_ARCH := $(if $(shell which arch 2>/dev/null),\ $(shell arch),\ $(shell lscpu | grep ^Architecture: | sed "s/^Architecture:[[:space:]]*\([[:alnum:][:punct:]]\+\).*/\1/")) IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/) -COMPOSE_CMD := \ - ALPINE_VERSION="$(ALPINE_VERSION)" \ - IMAGE_PREFIX="$(IMAGE_PREFIX)" \ - GEMINI_CERTIFICATES_DIR="$(GEMINI_CERTIFICATES_DIR)" \ - GEMINI_COMITIUM_DATA_DIR="$(GEMINI_COMITIUM_DATA_DIR)" \ - ETHERPAD_DATA_DIR="$(ETHERPAD_DATA_DIR)" \ - ETHERPAD_VERSION="$(ETHERPAD_VERSION)" \ - VAULTWARDEN_DATA_DIR="$(VAULTWARDEN_DATA_DIR)" \ - LOCAL_SMTP_PORT=$(PORT_smtp) \ - $(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \ - podman-compose REGISTRY_DOMAIN := git.joeac.net REGISTRY_USER := joeac diff --git a/make/openrc.mk b/make/openrc.mk index fa2c35a..ec76271 100644 --- a/make/openrc.mk +++ b/make/openrc.mk @@ -50,10 +50,10 @@ $(foreach module,$(MODULES),$(eval $(openrc_add_rule))) $(foreach module,$(MODULES),$(eval $(openrc_start_rule))) $(foreach module,$(MODULES),$(eval $(openrc_restart_rule))) -~/.config/rc/init.d/joeac.net: openrc/init.d/joeac.net ~/.config/rc/init.d ~/.config/rc/runlevels/default /etc/init.d/user.$(USER) /etc/conf.d/user.$(USER) +~/.config/rc/init.d/joeac.net: openrc/init.d/joeac.net.template ~/.config/rc/init.d ~/.config/rc/runlevels/default /etc/init.d/user.$(USER) /etc/conf.d/user.$(USER) rm -f ~/.config/rc/init.d/joeac.net; \ mkdir -p ~/.config/rc/init.d; \ - cp openrc/init.d/joeac.net ~/.config/rc/init.d/joeac.net + COMPOSECMD="$(COMPOSE_CMD)" envsubst -i openrc/init.d/joeac.net.template -o ~/.config/rc/init.d/joeac.net ~/.config/rc/init.d: mkdir -p ~/.config/rc/init.d diff --git a/make/vars.mk b/make/vars.mk index b40592e..2ea7f18 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -53,6 +53,18 @@ INSTALL_RULES := $(foreach module,$(MODULES),install_$(module)) REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module)) UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module)) +COMPOSE_CMD := \ + ALPINE_VERSION="$(ALPINE_VERSION)" \ + IMAGE_PREFIX="$(IMAGE_PREFIX)" \ + GEMINI_CERTIFICATES_DIR="$(GEMINI_CERTIFICATES_DIR)" \ + GEMINI_COMITIUM_DATA_DIR="$(GEMINI_COMITIUM_DATA_DIR)" \ + ETHERPAD_DATA_DIR="$(ETHERPAD_DATA_DIR)" \ + ETHERPAD_VERSION="$(ETHERPAD_VERSION)" \ + VAULTWARDEN_DATA_DIR="$(VAULTWARDEN_DATA_DIR)" \ + LOCAL_SMTP_PORT=$(PORT_smtp) \ + $(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \ + podman-compose + $(foreach module,$(ALL_NGINX_MODULES), \ $(if $(SUBDOMAIN_$(module)),, \ $(error $(module) is declared as an nginx module, but SUBDOMAIN_$(module) is not set))) |