From bf2dabe3f48dca6cd49bb703d2b7f244c54dfafa Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Wed, 1 Jul 2026 17:49:04 +0100
Subject: [PATCH] pulls out more dyndns stuff to dyndns.mk

---
 Makefile  |  7 ++++---
 dyndns.mk | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 644426a..b00474b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,10 @@ include config.mk
 #############
 
 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))
@@ -21,7 +23,6 @@ MAKE_MODULES := $(foreach module,$(MODULES),\
 # FUNCTIONS #
 #############
 
-dyndns_module_target = $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net)
 openrc_module_target = $(if $(filter $(COMPOSE_SERVICES),$(module)),~/.config/rc/init.d/joeac.net.$(module))
 install_submake_file = $(shell [ -f "$(module)/install.mk" ] && echo "$(module)/install.mk")
 
@@ -38,13 +39,13 @@ endef
 
 define install_module_rule =
 .PHONY: install_$(module)
-install_$(module): install_openrc_$(module) install_nginx_module_$(module) $(dyndns_module_target) $(install_submake_file)
+install_$(module): install_openrc_$(module) install_nginx_module_$(module) install_dyndns_module_$(module) $(install_submake_file)
 	$(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) install)
 endef
 
 define reinstall_module_rule =
 .PHONY: reinstall_$(module)
-reinstall_$(module): reinstall_openrc_$(module) reinstall_nginx_module_$(module) $(dyndns_module_target) $(install_submake_file)
+reinstall_$(module): reinstall_openrc_$(module) reinstall_nginx_module_$(module) reinstall_dyndns_module_$(module) $(install_submake_file)
 	$(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) reinstall)
 endef
 
diff --git a/dyndns.mk b/dyndns.mk
index 9ea751d..f8be9f7 100644
--- a/dyndns.mk
+++ b/dyndns.mk
@@ -1,11 +1,34 @@
-.PHONY: install_dyndns
-install_dyndns: /usr/local/bin/dyndns.sh ~/.config/dyndns/DIGITALOCEAN_TOKEN
+define install_dyndns_module_rule =
+.PHONY: install_dyndns_module_$(module)
+install_dyndns_module_$(module): $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net install_dyndns)
+endef
 
-.PHONY: reinstall_dyndns
-reinstall_dyndns: /usr/local/bin/dyndns.sh ~/.config/dyndns/DIGITALOCEAN_TOKEN
+define reinstall_dyndns_module_rule =
+.PHONY: reinstall_dyndns_module_$(module)
+reinstall_dyndns_module_$(module): $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net reinstall_dyndns)
+endef
+
+define uninstall_dyndns_module_rule =
+.PHONY: uninstall_dyndns_module_$(module)
+uninstall_dyndns_module_$(module):
+    $(if $(SUBDOMAIN_$(module)), \
+      rm -f /etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net
+    )
+endef
+
+$(foreach module,$(ALL_MODULES), $(eval $(install_dyndns_module_rule)))
+$(foreach module,$(ALL_MODULES), $(eval $(reinstall_dyndns_module_rule)))
+$(foreach module,$(ALL_MODULES), $(eval $(uninstall_dyndns_module_rule)))
+
+/etc/periodic/daily/dyndns-%joeac.net: /usr/local/bin/dyndns.sh ~/.config/dyndns/DIGITALOCEAN_TOKEN
+	echo "#!/bin/sh" > crontab.tmp
+	echo "                      /usr/local/bin/dyndns.sh 4 $(*F)joeac.net" >> crontab.tmp
+	echo "CONN_DEVICE_NAME=eth0 /usr/local/bin/dyndns.sh 6 $(*F)joeac.net" >> crontab.tmp
+	sudo mv crontab.tmp $@
+	sudo chmod +x $@
 
 .PHONY: uninstall_dyndns
-uninstall_dyndns:
+uninstall_dyndns: $(foreach module,$(ALL_MODULES),$(uninstall_dyndns_module_rule))
 	sudo rm -rf \
 		/usr/local/bin/dyndns.sh \
 		/usr/local/bin/get_ip_addr.sh \
@@ -29,10 +52,3 @@ uninstall_dyndns:
 	mkdir -p ~/.config/dyndns/
 	rm -f ~/.config/dyndns/DIGITALOCEAN_TOKEN
 	cp DIGITALOCEAN_TOKEN ~/.config/dyndns/DIGITALOCEAN_TOKEN
-
-/etc/periodic/daily/dyndns-%joeac.net: /usr/local/bin/dyndns.sh
-	echo "#!/bin/sh" > crontab.tmp
-	echo "                      /usr/local/bin/dyndns.sh 4 $(*F)joeac.net" >> crontab.tmp
-	echo "CONN_DEVICE_NAME=eth0 /usr/local/bin/dyndns.sh 6 $(*F)joeac.net" >> crontab.tmp
-	sudo mv crontab.tmp $@
-	sudo chmod +x $@