diff options
Diffstat (limited to 'make')
| -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),\ |