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

all nginx modules are installed on master node

Browse Source
This commit is contained in:
Joe Carstairs
2026-07-01 18:45:42 +01:00
parent 8ddbae5ee2
commit 0e4aaabb54
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -4
View File
@@ -20,19 +20,19 @@ endef
define install_module_rule = define install_module_rule =
.PHONY: install_$(module) .PHONY: install_$(module)
install_$(module): install_openrc_$(module) install_nginx_$(module) install_dyndns_$(module) $(install_submake_file) install_$(module): install_openrc_$(module) install_dyndns_$(module) $(install_submake_file)
$(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) install) $(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) install)
endef endef
define reinstall_module_rule = define reinstall_module_rule =
.PHONY: reinstall_$(module) .PHONY: reinstall_$(module)
reinstall_$(module): reinstall_openrc_$(module) reinstall_nginx_$(module) reinstall_dyndns_$(module) $(install_submake_file) reinstall_$(module): reinstall_openrc_$(module) reinstall_dyndns_$(module) $(install_submake_file)
$(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) reinstall) $(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) reinstall)
endef endef
define uninstall_module_rule = define uninstall_module_rule =
.PHONY: uninstall_$(module) .PHONY: uninstall_$(module)
uninstall_$(module): uninstall_openrc_$(module) uninstall_nginx_$(module) uninstall_dyndns_$(module) uninstall_$(module): uninstall_openrc_$(module) uninstall_dyndns_$(module)
$(if $(install_submake_file),\ $(if $(install_submake_file),\
$(MAKE) --makefile=$(notdir (install_submake_file)) --directory $(dir $(install_submake_file)) uninstall $(MAKE) --makefile=$(notdir (install_submake_file)) --directory $(dir $(install_submake_file)) uninstall
) )
@@ -50,7 +50,7 @@ $(foreach module,$(MAKE_MODULES),$(eval $(call make_module_rule)))
$(foreach module,$(MODULES),$(eval $(call module_env_rule))) $(foreach module,$(MODULES),$(eval $(call module_env_rule)))
.PHONY: install .PHONY: install
install: $(foreach module,$(MODULES),$(module)/.env install_$(module)) install_crontab install: install_nginx $(foreach module,$(MODULES),$(module)/.env install_$(module)) install_crontab
.PHONY: uninstall .PHONY: uninstall
uninstall: uninstall_nginx uninstall_dyndns 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
make/nginx.mk
+7 -1
View File
@@ -24,8 +24,14 @@ $(foreach module,$(MODULES),$(eval $(uninstall_nginx_module_rule)))
/etc/nginx/http.d: /etc/nginx/http.d:
sudo mkdir -p /etc/nginx/http.d sudo mkdir -p /etc/nginx/http.d
.PHONY: install_nginx
install_nginx: /etc/nginx/nginx.conf $(add_prefix install_nginx_,$(NGINX_MODULES))
.PHONY: reinstall_nginx
reinstall_nginx: /etc/nginx/nginx.conf $(add_prefix reinstall_nginx_,$(NGINX_MODULES))
.PHONY: uninstall_nginx .PHONY: uninstall_nginx
uninstall_nginx: $(foreach module,$(MODULES),uninstall_nginx_$(module)) uninstall_nginx: $(foreach module,$(NGINX_MODULES),uninstall_nginx_$(module))
ifeq ($(shell test -d /etc/nginx/nginx.joeac.net-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
make/vars.mk
+1
View File
@@ -5,6 +5,7 @@ MODULES_blade-canongate := etherpad
ALL_MODULES := $(sort $(foreach hostname,$(HOSTNAMES),$(MODULES_$(hostname)))) ALL_MODULES := $(sort $(foreach hostname,$(HOSTNAMES),$(MODULES_$(hostname))))
MASTER_NODE := pi-broughton MASTER_NODE := pi-broughton
IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME)) IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME))
NGINX_MODULES := $(if $(IS_MASTER_NODE),$(ALL_MODULES))
MODULES := $(MODULES_$(HOSTNAME)) MODULES := $(MODULES_$(HOSTNAME))
SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module))) SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module)))
COMPOSE_SERVICES := $(shell podman-compose config \ COMPOSE_SERVICES := $(shell podman-compose config \