moves stuff to nginx.mk

5 files changed, 31 insertions, 39 deletions

diff --git a/.editorconfig b/.editorconfig
index 9ec5b29..241e9a7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,6 @@ indent_size = 2
 
 [*.{md,markdown,mdx}]
 max_line_length = 80
+
+[{Makefile,*.mk}]
+indent_style = tab
diff --git a/Makefile b/Makefile
index 3a14e68..f9eeeb1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,12 +50,7 @@ endef
 
 define uninstall_module_rule =
 .PHONY: uninstall_$(module)
-uninstall_$(module): uninstall_openrc_$(module)
-	$(if $(SUBDOMAIN_$(module)),\
-		sudo rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf; \
-		$(RESTART_NGINX); \
-		sudo rm -f /etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net; \
-	)
+uninstall_$(module): uninstall_openrc_$(module) uninstall_nginx_$(module) uninstall_dyndns_module_$(module)
 	$(if $(install_submake_file),\
 		$(MAKE) --makefile=$(notdir (install_submake_file)) --directory $(dir $(install_submake_file)) uninstall
 	)
diff --git a/dyndns.mk b/dyndns.mk
index f8be9f7..660bc20 100644
--- a/dyndns.mk
+++ b/dyndns.mk
@@ -12,7 +12,7 @@ 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
+      sudo rm -f /etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net
     )
 endef
 
diff --git a/nginx.mk b/nginx.mk
index 4f7e856..c78f20b 100644
--- a/nginx.mk
+++ b/nginx.mk
@@ -1,11 +1,29 @@
-.PHONY: install_nginx
-install_nginx: /etc/nginx/nginx.joeac.net-backup /etc/nginx/nginx.conf
+define install_nginx_module_rule =
+.PHONY: install_nginx_$(module)
+install_nginx_$(module): $(if $(SUBDOMAIN_$(module)),/etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf)
+endef
 
-.PHONY: reinstall_nginx
-reinstall_nginx: /etc/nginx/nginx.joeac.net-backup /etc/nginx/nginx.conf
+define reinstall_nginx_module_rule =
+.PHONY: reinstall_nginx_$(module)
+reinstall_nginx_$(module): $(if $(SUBDOMAIN_$(module)),/etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf)
+endef
+
+define uninstall_nginx_module_rule =
+.PHONY: uninstall_nginx_$(module)
+uninstall_nginx_$(module):
+endef
+
+$(foreach module,$(MODULES),$(eval $(install_nginx_module_rule)))
+
+/etc/nginx/http.d/%.joeac.net.conf: nginx/http.d/%.joeac.net.conf /etc/nginx/http.d /etc/nginx/nginx.conf
+	sudo cp $< $@
+	sudo rc-service nginx restart
+
+/etc/nginx/http.d:
+	sudo mkdir -p /etc/nginx/http.d
 
 .PHONY: uninstall_nginx
-uninstall_nginx: uninstall_dyndns
+uninstall_nginx: $(foreach module,$(MODULES),uninstall_nginx_$(module))
 ifeq ($(shell test -d /etc/nginx/nginx.joeac.net-backup && echo 1 || echo 0),0)
 	$(warn No nginx backup config detected: doing nothing)
 else
@@ -13,9 +31,9 @@ else
 	sudo rc-service nginx restart
 endif
 
-/etc/nginx/nginx.joeac.net-backup:
-	sudo mv /etc/nginx/nginx.conf /etc/nginx/nginx.joeac.net-backup
-
 /etc/nginx/nginx.conf: nginx/nginx.conf /etc/nginx/nginx.joeac.net-backup
 	sudo cp $< $@
 	sudo rc-service nginx restart
+
+/etc/nginx/nginx.joeac.net-backup:
+	sudo mv /etc/nginx/nginx.conf /etc/nginx/nginx.joeac.net-backup
diff --git a/nginx_module.mk b/nginx_module.mk
deleted file mode 100644
index 949421d..0000000
--- a/nginx_module.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-define install_nginx_module_rule =
-.PHONY: install_nginx_module_rule
-install_nginx_module_rule: $(if $(SUBDOMAIN_$(module)),/etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf)
-endef
-
-define reinstall_nginx_module_rule =
-.PHONY: reinstall_nginx_module_rule
-reinstall_nginx_module_rule: $(if $(SUBDOMAIN_$(module)),/etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf)
-endef
-
-define uninstall_nginx_module_rule =
-.PHONY: uninstall_nginx_module_rule
-uninstall_nginx_module_rule:
-	$(if $(SUBDOMAIN_$(module)),rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf)
-endef
-
-$(foreach module,$(MODULES),$(eval $(install_nginx_module_rule)))
-
-/etc/nginx/http.d/%.joeac.net.conf: nginx/http.d/%.joeac.net.conf /etc/nginx/http.d /etc/nginx/nginx.conf
-	sudo cp $< $@
-	sudo rc-service nginx restart
-
-/etc/nginx/http.d:
-	sudo mkdir -p /etc/nginx/http.d