diff options
Diffstat (limited to 'make/vars.mk')
| -rw-r--r-- | make/vars.mk | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/make/vars.mk b/make/vars.mk index d7f9b19..8daf287 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -7,9 +7,9 @@ IP_ADDR_pi-broughton := 192.168.178.91 IP_ADDR_blade-canongate := 192.168.178.75 MASTER_NODE := blade-canongate IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME)) -MODULES_pi-broughton := actualbudget http smtp vaultwarden ln -MODULES_blade-canongate := etherpad gemini mox mox_clientsettings mox_autoconfig mox_mta_sts -ALL_NGINX_MODULES := actualbudget http vaultwarden ln etherpad mox mox_clientsettings mox_autoconfig mox_mta_sts +MODULES_pi-broughton := actualbudget http smtp vaultwarden +MODULES_blade-canongate := etherpad gemini +ALL_NGINX_MODULES := actualbudget http vaultwarden etherpad NGINX_MODULES := $(if $(IS_MASTER_NODE),$(ALL_NGINX_MODULES)) MODULES := $(MODULES_$(HOSTNAME)) ALL_MODULES := $(sort $(foreach hostname,$(HOSTNAMES),$(MODULES_$(hostname)))) @@ -22,25 +22,14 @@ SUBDOMAIN_actualbudget := budget SUBDOMAIN_http := @ SUBDOMAIN_vaultwarden := pwd SUBDOMAIN_etherpad := docs -SUBDOMAIN_ln := ln -SUBDOMAIN_mox := mail -SUBDOMAIN_mox_autoconfig := autoconfig.mail -SUBDOMAIN_mox_clientsettings := clientsettings.mail -SUBDOMAIN_mox_mta_sts := mta-sts.mail PORT_actualbudget := 5006 PORT_etherpad := 9001 PORT_http := 8080 PORT_gemini := 1965 -PORT_mox := 81 -PORT_mox_autoconfig := $(PORT_mox) -PORT_mox_clientsettings := $(PORT_mox) -PORT_mox_mta_sts := $(PORT_mox) PORT_smtp := 2500 PORT_vaultwarden := 9000 -PUBLIC_ROOT_DIR_ln := /var/ln.joeac.net/public - export ACTUALBUDGET_DATA_DIR := /var/joeac.net-actualbudget/var export ETHERPAD_DATA_DIR := /var/etherpad/var export GEMINI_CERTIFICATES_DIR := /var/joeac.net-gemini/certificates @@ -57,7 +46,6 @@ $(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \ ALL_SUBDOMAINS := $(foreach module,$(ALL_MODULES),$(SUBDOMAIN_$(module))) SUBDOMAINS := $(if $(IS_MASTER_NODE),$(ALL_SUBDOMAINS)) -NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module))) ENV_RULES := $(foreach module,$(MODULES),$(if $(shell test -d $(module) && echo 1),$(module)/.env)) MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module)) @@ -83,10 +71,3 @@ COMPOSE_CMD := \ 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))) -$(foreach module,$(ALL_NGINX_MODULES), \ - $(if $(PORT_$(module)) $(HOST_$(module)),,$(if $(PUBLIC_ROOT_DIR_$(module)),, \ - $(error $(module) is declared as an nginx module, but neither PUBLIC_ROOT_DIR_$(module), nor both PORT_$(module) and HOST_$(module), are set)))) |