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

Compare commits

base: joeac/joeac.net:0c87d0cc653dacb09721f4064ac10d17daa48ce8
Branches Tags
joeac/joeac.net:main
...
compare: joeac/joeac.net:dcdda64b9e0e96b75c1082f13c79338bf0f1c3d9
Branches Tags
joeac/joeac.net:main

2 Commits
0c87d0cc65 ... dcdda64b9e

Author SHA1 Message Date
joeac dcdda64b9e distinguishes NGINX_SUBDOMAINS from SUBDOMAINS 2026-07-02 09:19:09 +01:00
joeac 5cc5b04b18 moves subdomain defs to top of vars.mk so can be used for SUBDOMAINS var 2026-07-02 09:17:14 +01:00
2 changed files with 6 additions and 5 deletions
Expand all files Collapse all files
make/nginx.mk
+1 -1
View File
@@ -1,6 +1,6 @@
installed_nginx_sites = $(wildcard /etc/nginx/http.d/*.joeac.net.conf) installed_nginx_sites = $(wildcard /etc/nginx/http.d/*.joeac.net.conf)
installed_nginx_subdomains = $(installed_nginx_sites:/etc/nginx/http.d/%.joeac.net.conf=%) installed_nginx_subdomains = $(installed_nginx_sites:/etc/nginx/http.d/%.joeac.net.conf=%)
nginx_subdomains_to_remove = $(filter-out $(SUBDOMAINS),$(installed_nginx_subdomains)) nginx_subdomains_to_remove = $(filter-out $(NGINX_SUBDOMAINS),$(installed_nginx_subdomains))
nginx_sites_to_remove = $(nginx_subdomains_to_remove:%=/etc/nginx/http.d/%.joeac.net.conf) nginx_sites_to_remove = $(nginx_subdomains_to_remove:%=/etc/nginx/http.d/%.joeac.net.conf)
define install_nginx_module_rule = define install_nginx_module_rule =
make/vars.mk
+5 -4
View File
@@ -1,3 +1,7 @@
SUBDOMAIN_http := @
SUBDOMAIN_vaultwarden := pwd
SUBDOMAIN_etherpad := docs
SUBDOMAIN_ln := ln
HOSTNAME := $(shell cat /etc/hostname) HOSTNAME := $(shell cat /etc/hostname)
HOSTNAMES := pi-broughton blade-canongate HOSTNAMES := pi-broughton blade-canongate
MODULES_pi-broughton := http gemini smtp vaultwarden ln MODULES_pi-broughton := http gemini smtp vaultwarden ln
@@ -8,6 +12,7 @@ IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME))
NGINX_MODULES := $(if $(IS_MASTER_NODE),$(ALL_MODULES)) 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)))
NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module)))
COMPOSE_SERVICES := $(shell podman-compose config \ 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),\
@@ -19,7 +24,3 @@ PUSH_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),push_$(m
INSTALL_RULES := $(foreach module,$(MODULES),install_$(module)) INSTALL_RULES := $(foreach module,$(MODULES),install_$(module))
REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module)) REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module))
UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module)) UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module))
SUBDOMAIN_http := @
SUBDOMAIN_vaultwarden := pwd
SUBDOMAIN_etherpad := docs
SUBDOMAIN_ln := ln