From c1096e2b0116acc7dd303bae8d4c4e0fad310ba6 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <s1806931@ed.ac.uk>
Date: Wed, 1 Jul 2026 15:46:05 +0100
Subject: [PATCH] pulls out nginx.mk

---
 Makefile | 44 ++++++++------------------------------------
 nginx.mk | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 nginx.mk

diff --git a/Makefile b/Makefile
index 63d6382..b53f50a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,17 @@ REGISTRY_DOMAIN := git.joeac.net
 REGISTRY_USER := joeac
 MODULES_pi-broughton := http gemini smtp vaultwarden ln
 MODULES_blade-canongate := etherpad
+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)))
+NGINX_CONFIG_SRC := nginx/nginx.conf
+NGINX_CONFIG := /etc/nginx/nginx.conf
+NGINX_CONFIG_BACKUP := /etc/nginx/nginx.joeac.net-backup
 RESTART_NGINX := sudo rc-service nginx restart
 
 
@@ -144,39 +150,11 @@ login_registry:
 install: $(foreach module,$(MODULES),install_$(module)) install_crontab
 
 .PHONY: uninstall
-uninstall: uninstall_nginx uninstall_joeac.net_service $(foreach module,$(MODULES),uninstall_$(module)) uninstall_crontab
+uninstall: uninstall_nginx uninstall_dyndns uninstall_joeac.net_service $(foreach module,$(MODULES),uninstall_$(module)) uninstall_crontab
 
 .PHONY: uninstall_joeac.net_service
 	rm ~/.config/rc/joeac.net
 
-nginx_src := $(shell find -L nginx -type f)
-nginx_target := $(addprefix /etc/,$(nginx_src))
-NGINX_CONFIG_SRC := nginx/nginx.conf
-NGINX_CONFIG := /etc/nginx/nginx.conf
-NGINX_CONFIG_BACKUP := /etc/nginx/nginx.joeac.net-backup
-nginx_config_backup_exists = $(shell test -d $(NGINX_CONFIG_BACKUP) && echo 1 || echo 0)
-.PHONY: install_nginx
-install_nginx: $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG) install_dyndns
-
-$(NGINX_CONFIG_BACKUP):
-ifeq ($(nginx_config_backup_exists),0)
-	sudo mv $(NGINX_CONFIG) $(NGINX_CONFIG_BACKUP)
-endif
-
-$(NGINX_CONFIG): $(NGINX_CONFIG_SRC)
-	sudo cp $< $@
-	$(RESTART_NGINX)
-
-.PHONY: uninstall_nginx
-uninstall_nginx: uninstall_dyndns
-ifeq ($(nginx_config_backup_exists),0)
-	@echo "No nginx backup config detected: doing nothing"
-else
-	sudo rm -f $(NGINX_CONFIG)
-	sudo mv $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG)
-	$(RESTART_NGINX)
-endif
-
 $(foreach module,$(MODULES),$(eval $(install_module_rule)))
 $(foreach module,$(MODULES),$(eval $(reinstall_module_rule)))
 $(foreach module,$(MODULES),$(eval $(uninstall_module_rule)))
@@ -204,13 +182,7 @@ $(foreach module,$(MODULES),$(eval $(openrc_restart_rule)))
 	sudo cp openrc/conf.d/user.$(shell whoami) /etc/conf.d/user.$(shell whoami)
 	sudo rc-update add user.$(shell whoami) default
 
-/etc/nginx/http.d/%joeac.net.conf: nginx/http.d/%joeac.net.conf install_nginx /etc/nginx/http.d
-	sudo cp $< $@
-	$(RESTART_NGINX)
-
-/etc/nginx/http.d:
-	sudo mkdir -p /etc/nginx/http.d
-
+include nginx.mk
 include crontab.mk
 include dyndns.mk
 
diff --git a/nginx.mk b/nginx.mk
new file mode 100644
index 0000000..8ae9076
--- /dev/null
+++ b/nginx.mk
@@ -0,0 +1,28 @@
+.PHONY: install_nginx
+install_nginx: $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG)
+
+.PHONY: reinstall_nginx
+reinstall_nginx: $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG)
+
+.PHONY: uninstall_nginx
+uninstall_nginx: uninstall_dyndns
+ifeq ($(shell test -d $(NGINX_CONFIG_BACKUP) && echo 1 || echo 0),0)
+	$(warn No nginx backup config detected: doing nothing)
+else
+	sudo mv $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG)
+	$(RESTART_NGINX)
+endif
+
+$(NGINX_CONFIG_BACKUP):
+	sudo mv $(NGINX_CONFIG) $(NGINX_CONFIG_BACKUP)
+
+$(NGINX_CONFIG): $(NGINX_CONFIG_SRC) $(NGINX_CONFIG_BACKUP)
+	sudo cp $< $@
+	$(RESTART_NGINX)
+
+/etc/nginx/http.d/%joeac.net.conf: nginx/http.d/%joeac.net.conf /etc/nginx/http.d $(NGINX_CONFIG)
+	sudo cp $< $@
+	$(RESTART_NGINX)
+
+/etc/nginx/http.d:
+	sudo mkdir -p /etc/nginx/http.d