joeac/joeac.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moves stuff to nginx.mk

Browse Source
This commit is contained in:
Joe Carstairs
2026-07-01 18:11:08 +01:00
parent 2b00e03999
commit c0e6d13a1f
5 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+3
View File
@@ -5,3 +5,6 @@ indent_size = 2
[*.{md,markdown,mdx}]
max_line_length = 80
[{Makefile,*.mk}]
indent_style = tab
Makefile
+1 -6
View File
@@ -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
)
dyndns.mk
+1 -1
View File
@@ -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
nginx.mk
+26 -8
View File
@@ -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
nginx_module.mk
-24
View File
@@ -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