From 1b200f217b5bcbe8a57b65030221aff47e8567d1 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Wed, 1 Jul 2026 18:19:26 +0100
Subject: [PATCH] move vars to vars.mk

---
 Makefile  | 20 +-------------------
 config.mk |  4 ----
 vars.mk   | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 config.mk
 create mode 100644 vars.mk

diff --git a/Makefile b/Makefile
index f9eeeb1..296c7de 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/vars.mk b/vars.mk
new file mode 100644
index 0000000..4d7b188
--- /dev/null
+++ b/vars.mk
@@ -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