Merge branch 'main' of https://git.joeac.net/joeac/joeac.net

Makefile

@@ -53,7 +53,7 @@ $(foreach module,$(MODULES),$(eval $(call module_env_rule)))
 install: install_nginx $(ENV_RULES) $(INSTALL_RULES) install_crontab
 
 .PHONY: reinstall
-reinstall: reinstall_nginx $(ENV_RULES) $(REINSTALL_RULES) reinstall_crontab
+reinstall: reinstall_nginx reinstall_dyndns $(ENV_RULES) $(REINSTALL_RULES) reinstall_crontab
 
 .PHONY: uninstall
 uninstall: uninstall_nginx uninstall_dyndns uninstall_joeac.net_service $(UNINSTALL_RULES) uninstall_crontab

make/dyndns.mk

@@ -1,3 +1,8 @@
+installed_dyndns_crontabs = $(wildcard /etc/periodic/daily/dyndns-*.joeac.net)
+installed_dyndns_subdomains = $(installed_dyndns_crontabs:/etc/periodic/daily/dyndns-%.joeac.net=%)
+dyndns_subdomains_to_remove = $(filter-out $(SUBDOMAINS),$(installed_dyndns_subdomains))
+dyndns_crontabs_to_remove = $(dyndns_subdomains_to_remove:%=/etc/periodic/daily/dyndns-%.joeac.net)
+
 define install_dyndns_module_rule =
 .PHONY: install_dyndns_$(module)
 install_dyndns_module_$(module): $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net install_dyndns)
@@ -20,6 +25,10 @@ $(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)))
 
+.PHONY: remove_/etc/periodic/daily/dyndns-%.joeac.net
+remove_/etc/periodic/daily/dyndns-%.joeac.net:
+	rm -f $(@:remove_%=%)
+
 /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
@@ -27,6 +36,9 @@ $(foreach module,$(ALL_MODULES), $(eval $(uninstall_dyndns_module_rule)))
 	sudo mv crontab.tmp $@
 	sudo chmod +x $@
 
+.PHONY: reinstall_dyndns
+reinstall_dyndns: $(addprefix remove_,$(dyndns_crontabs_to_remove))
+
 .PHONY: uninstall_dyndns
 uninstall_dyndns: $(foreach module,$(ALL_MODULES),$(uninstall_dyndns_$(module)))
 	sudo rm -rf \

make/nginx.mk

@@ -36,6 +36,10 @@ $(foreach site,$(nginx_sites_to_remove),$(eval $(remove_nginx_site_rule)))
 /etc/nginx/http.d:
 	sudo mkdir -p /etc/nginx/http.d
 
+.PHONY: remove_/etc/nginx/http.d/%.joeac.net.conf
+remove_/etc/nginx/http.d/%.joeac.net.conf:
+	rm -f $(@:remove_%=%)
+
 .PHONY: install_nginx
 install_nginx: /etc/nginx/nginx.conf $(add_prefix install_nginx_,$(NGINX_MODULES))