diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-02 17:54:18 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-02 17:55:00 +0100 |
| commit | c89f338601cd324a24b21a8a2b5bb4666779bba8 (patch) | |
| tree | 6896eaccf08df6c4713a656886235a0a2944c995 | |
| parent | 6feaddc542af5d6c417af6e5cff9a96b3921cac5 (diff) | |
re-orders vars.mk
| -rw-r--r-- | make/vars.mk | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/make/vars.mk b/make/vars.mk index dd5c7f8..f5806e6 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -1,3 +1,17 @@ +HOSTNAME := $(shell cat /etc/hostname) +HOSTNAMES := pi-broughton blade-canongate +MASTER_NODE := pi-broughton +MODULES_pi-broughton := http gemini smtp vaultwarden ln +MODULES_blade-canongate := etherpad +MODULES := $(MODULES_$(HOSTNAME)) +ALL_MODULES := $(sort $(foreach hostname,$(HOSTNAMES),$(MODULES_$(hostname)))) +IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME)) +NGINX_MODULES := $(if $(IS_MASTER_NODE),$(ALL_MODULES)) +COMPOSE_SERVICES := $(shell podman-compose config \ + | yq ".services | keys" --output-format csv --csv-separator " ") +MAKE_MODULES := $(foreach module,$(MODULES),\ + $(shell [ -f $(module)/Makefile ] && echo $(module))) + SUBDOMAIN_http := @ SUBDOMAIN_vaultwarden := pwd SUBDOMAIN_etherpad := docs @@ -9,21 +23,8 @@ PORT_gemini := 1965 PORT_smtp := 2500 PORT_vaultwarden := 9000 -HOSTNAME := $(shell cat /etc/hostname) -HOSTNAMES := pi-broughton blade-canongate -MODULES_pi-broughton := http gemini smtp vaultwarden ln -MODULES_blade-canongate := etherpad -ALL_MODULES := $(sort $(foreach hostname,$(HOSTNAMES),$(MODULES_$(hostname)))) -MASTER_NODE := pi-broughton -IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME)) -NGINX_MODULES := $(if $(IS_MASTER_NODE),$(ALL_MODULES)) -MODULES := $(MODULES_$(HOSTNAME)) SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module))) NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module))) -COMPOSE_SERVICES := $(shell podman-compose config \ - | yq ".services | keys" --output-format csv --csv-separator " ") -MAKE_MODULES := $(foreach module,$(MODULES),\ - $(shell [ -f $(module)/Makefile ] && echo $(module))) ENV_RULES := $(foreach module,$(MODULES),$(module)/.env) MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module)) |