diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-01 18:19:26 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-01 18:19:26 +0100 |
| commit | 1b200f217b5bcbe8a57b65030221aff47e8567d1 (patch) | |
| tree | 677e871306a077258f93a5756244b61dfaad54aa | |
| parent | c0e6d13a1f3e47aba9d65f605ffeb8365abfda36 (diff) | |
move vars to vars.mk
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | config.mk | 4 | ||||
| -rw-r--r-- | vars.mk | 17 |
3 files changed, 18 insertions, 23 deletions
@@ -1,22 +1,4 @@ -include config.mk - -############# -# VARIABLES # -############# - -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)) -MODULES := $(MODULES_$(HOSTNAME)) -SUBDOMAINS := $(foreach module,$(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))) +include vars.mk ############# diff --git a/config.mk b/config.mk deleted file mode 100644 index 91548bb..0000000 --- a/config.mk +++ /dev/null @@ -1,4 +0,0 @@ -SUBDOMAIN_http := @ -SUBDOMAIN_vaultwarden := pwd -SUBDOMAIN_etherpad := docs -SUBDOMAIN_ln := ln @@ -0,0 +1,17 @@ +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)) +MODULES := $(MODULES_$(HOSTNAME)) +SUBDOMAINS := $(foreach module,$(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))) +SUBDOMAIN_http := @ +SUBDOMAIN_vaultwarden := pwd +SUBDOMAIN_etherpad := docs +SUBDOMAIN_ln := ln |