re-orders vars.mk
This commit is contained in:
+14
-13
@@ -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_http := @
|
||||||
SUBDOMAIN_vaultwarden := pwd
|
SUBDOMAIN_vaultwarden := pwd
|
||||||
SUBDOMAIN_etherpad := docs
|
SUBDOMAIN_etherpad := docs
|
||||||
@@ -9,21 +23,8 @@ PORT_gemini := 1965
|
|||||||
PORT_smtp := 2500
|
PORT_smtp := 2500
|
||||||
PORT_vaultwarden := 9000
|
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)))
|
SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module)))
|
||||||
NGINX_SUBDOMAINS := $(foreach module,$(NGINX_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)
|
ENV_RULES := $(foreach module,$(MODULES),$(module)/.env)
|
||||||
MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module))
|
MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module))
|
||||||
|
|||||||
Reference in New Issue
Block a user