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

removes unneeded nginx vars in Makefiles

Browse Source
This commit is contained in:
Joe Carstairs
2026-07-01 17:33:53 +01:00
parent 89165e9d88
commit d0f549ce22
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
-4
View File
@@ -15,10 +15,6 @@ COMPOSE_SERVICES := $(shell podman-compose config \
| yq ".services | keys" --output-format csv --csv-separator " ") | yq ".services | keys" --output-format csv --csv-separator " ")
MAKE_MODULES := $(foreach module,$(MODULES),\ MAKE_MODULES := $(foreach module,$(MODULES),\
$(shell [ -f $(module)/Makefile ] && echo $(module))) $(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
############# #############
nginx.mk
+9 -9
View File
@@ -1,21 +1,21 @@
.PHONY: install_nginx .PHONY: install_nginx
install_nginx: $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG) install_nginx: /etc/nginx/nginx.joeac.net-backup /etc/nginx/nginx.conf
.PHONY: reinstall_nginx .PHONY: reinstall_nginx
reinstall_nginx: $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG) reinstall_nginx: /etc/nginx/nginx.joeac.net-backup /etc/nginx/nginx.conf
.PHONY: uninstall_nginx .PHONY: uninstall_nginx
uninstall_nginx: uninstall_dyndns uninstall_nginx: uninstall_dyndns
ifeq ($(shell test -d $(NGINX_CONFIG_BACKUP) && echo 1 || echo 0),0) ifeq ($(shell test -d /etc/nginx/nginx.joeac.net-backup && echo 1 || echo 0),0)
$(warn No nginx backup config detected: doing nothing) $(warn No nginx backup config detected: doing nothing)
else else
sudo mv $(NGINX_CONFIG_BACKUP) $(NGINX_CONFIG) sudo mv /etc/nginx/nginx.joeac.net-backup /etc/nginx/nginx.conf
$(RESTART_NGINX) sudo rc-service nginx restart
endif endif
$(NGINX_CONFIG_BACKUP): /etc/nginx/nginx.joeac.net-backup:
sudo mv $(NGINX_CONFIG) $(NGINX_CONFIG_BACKUP) sudo mv /etc/nginx/nginx.conf /etc/nginx/nginx.joeac.net-backup
$(NGINX_CONFIG): $(NGINX_CONFIG_SRC) $(NGINX_CONFIG_BACKUP) /etc/nginx/nginx.conf: nginx/nginx.conf /etc/nginx/nginx.joeac.net-backup
sudo cp $< $@ sudo cp $< $@
$(RESTART_NGINX) sudo rc-service nginx restart
nginx_module.mk
+2 -2
View File
@@ -16,9 +16,9 @@ endef
$(foreach module,$(MODULES),$(eval $(install_nginx_module_rule))) $(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 $(NGINX_CONFIG) /etc/nginx/http.d/%.joeac.net.conf: nginx/http.d/%.joeac.net.conf /etc/nginx/http.d /etc/nginx/nginx.conf
sudo cp $< $@ sudo cp $< $@
$(RESTART_NGINX) sudo rc-service nginx restart
/etc/nginx/http.d: /etc/nginx/http.d:
sudo mkdir -p /etc/nginx/http.d sudo mkdir -p /etc/nginx/http.d