diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-02 09:19:09 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-02 09:19:09 +0100 |
| commit | dcdda64b9e0e96b75c1082f13c79338bf0f1c3d9 (patch) | |
| tree | aa3cd22a38f85a520a52d9c6b1046286b2e79c9c | |
| parent | 5cc5b04b18019f8071e9f6884688171169ec87c7 (diff) | |
distinguishes NGINX_SUBDOMAINS from SUBDOMAINS
| -rw-r--r-- | make/nginx.mk | 2 | ||||
| -rw-r--r-- | make/vars.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/make/nginx.mk b/make/nginx.mk index 14f6b80..e20820d 100644 --- a/make/nginx.mk +++ b/make/nginx.mk @@ -1,6 +1,6 @@ installed_nginx_sites = $(wildcard /etc/nginx/http.d/*.joeac.net.conf) installed_nginx_subdomains = $(installed_nginx_sites:/etc/nginx/http.d/%.joeac.net.conf=%) -nginx_subdomains_to_remove = $(filter-out $(SUBDOMAINS),$(installed_nginx_subdomains)) +nginx_subdomains_to_remove = $(filter-out $(NGINX_SUBDOMAINS),$(installed_nginx_subdomains)) nginx_sites_to_remove = $(nginx_subdomains_to_remove:%=/etc/nginx/http.d/%.joeac.net.conf) define install_nginx_module_rule = diff --git a/make/vars.mk b/make/vars.mk index 91ec604..f7ec98d 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -12,6 +12,7 @@ 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),\ |