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

tls.mk: subdomains, not modules

Browse Source
This commit is contained in:
Joe Carstairs
2026-07-07 09:20:06 +01:00
parent 07fa302d43
commit c18fd9c44e
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make/tls.mk
+21 -21
View File
@@ -7,23 +7,23 @@ installed_tls_certs = $(wildcard /etc/letsencrypt/live/*.joeac.net)
installed_tls_cert_subdomains = $(installed_tls_certs:/etc/letsencrypt/live/%.joeac.net=%) installed_tls_cert_subdomains = $(installed_tls_certs:/etc/letsencrypt/live/%.joeac.net=%)
tls_cert_subdomains_to_delete = $(filter-out $(SUBDOMAINS),$(installed_tls_cert_subdomains)) tls_cert_subdomains_to_delete = $(filter-out $(SUBDOMAINS),$(installed_tls_cert_subdomains))
tls_crontab = /etc/periodic/daily/tls-$(SUBDOMAIN_$(module)).joeac.net tls_crontab = /etc/periodic/daily/tls-$(subdomain).joeac.net
tls_cert = /etc/letsencrypt/live/$(SUBDOMAIN_$(module)).joeac.net/fullchain.pem tls_cert = /etc/letsencrypt/live/$(subdomain).joeac.net/fullchain.pem
define install_tls_module_rule = define install_tls_subdomain_rule =
.PHONY: install_tls_$(module) .PHONY: install_tls_$(subdomain)
install_tls_module_$(module): $(if $(SUBDOMAIN_$(module)),$(tls_crontab) $(tls_cert)) install_tls_$(subdomain): $(tls_crontab) $(tls_cert)
endef endef
define reinstall_tls_module_rule = define reinstall_tls_subdomain_rule =
.PHONY: reinstall_tls_$(module) .PHONY: reinstall_tls_$(subdomain)
reinstall_tls_$(module): $(if $(SUBDOMAIN_$(module)),$(tls_crontab) renew_$(tls_cert)) reinstall_tls_$(subdomain): $(tls_crontab) renew_$(tls_cert)
endef endef
define uninstall_tls_module_rule = define uninstall_tls_subdomain_rule =
.PHONY: uninstall_tls_$(module) .PHONY: uninstall_tls_$(subdomain)
uninstall_tls_$(module): delete_cert_$(SUBDOMAIN_$(module)).joeac.net uninstall_tls_$(subdomain): delete_cert_$(subdomain).joeac.net
$(if $(SUBDOMAIN_$(module)), \ $(if $(shell test [ -f $(tls_crontab) ] && echo 1),\
sudo rm -f $(tls_crontab) sudo rm -f $(tls_crontab)
) )
endef endef
@@ -31,11 +31,11 @@ endef
define obtain_or_renew_cert_cmd = define obtain_or_renew_cert_cmd =
sudo certbot certonly sudo certbot certonly
--nginx \ --nginx \
--cert-name $(SUBDOMAIN_$(module)) \ --cert-name $(subdomain) \
--domain $(subst @.,,$(SUBDOMAIN_$(module)).)joeac.net --domain $(subst @.,,$(subdomain).)joeac.net
endef endef
is_cert_expired = $(shell sudo certbot certificates --cert-name $(SUBDOMAIN_$(module)).joeac.net \ is_cert_expired = $(shell sudo certbot certificates --cert-name $(subdomain).joeac.net \
| grep "Expiry Date" | grep -E "(EXPIRED|REVOKED)") | grep "Expiry Date" | grep -E "(EXPIRED|REVOKED)")
define cert_rule = define cert_rule =
$(tls_cert): $(tls_cert):
@@ -46,10 +46,10 @@ renew_$(tls_cert):
$(if $(is_cert_expired),$(obtain_or_renew_cert_cmd)) $(if $(is_cert_expired),$(obtain_or_renew_cert_cmd))
endef endef
$(foreach module,$(ALL_MODULES), $(eval $(install_tls_module_rule))) $(foreach subdomain,$(ALL_SUBDOMAINS), $(eval $(install_tls_subdomain_rule)))
$(foreach module,$(ALL_MODULES), $(eval $(reinstall_tls_module_rule))) $(foreach subdomain,$(ALL_SUBDOMAINS), $(eval $(reinstall_tls_subdomain_rule)))
$(foreach module,$(ALL_MODULES), $(eval $(uninstall_tls_module_rule))) $(foreach subdomain,$(ALL_SUBDOMAINS), $(eval $(uninstall_tls_subdomain_rule)))
$(foreach module,$(ALL_MODULES), $(eval $(cert_rule))) $(foreach subdomain,$(ALL_SUBDOMAINS), $(eval $(cert_rule)))
.PHONY: remove_/etc/periodic/daily/tls-%.joeac.net .PHONY: remove_/etc/periodic/daily/tls-%.joeac.net
remove_/etc/periodic/daily/tls-%.joeac.net: remove_/etc/periodic/daily/tls-%.joeac.net:
@@ -61,7 +61,7 @@ delete_cert_%.joeac.net:
/etc/periodic/daily/tls-%joeac.net: /etc/periodic/daily/tls-%joeac.net:
echo "#!/bin/sh" > crontab.tmp echo "#!/bin/sh" > crontab.tmp
echo "certbot renew --cert-name $(SUBDOMAIN_$(module)) --non-interactive" >> crontab.tmp echo "certbot renew --cert-name $(subdomain) --non-interactive" >> crontab.tmp
sudo mv crontab.tmp $@ sudo mv crontab.tmp $@
sudo chmod +x $@ sudo chmod +x $@
@@ -69,7 +69,7 @@ delete_cert_%.joeac.net:
reinstall_tls: $(addprefix remove_,$(tls_crontabs_to_remove)) $(addprefix delete_cert_,$(tls_cert_subdomains_to_delete)) $(foreach subdomain,$(installed_tls_cert_subdomains),renew_$(tls_cert)) reinstall_tls: $(addprefix remove_,$(tls_crontabs_to_remove)) $(addprefix delete_cert_,$(tls_cert_subdomains_to_delete)) $(foreach subdomain,$(installed_tls_cert_subdomains),renew_$(tls_cert))
.PHONY: uninstall_tls .PHONY: uninstall_tls
uninstall_tls: $(foreach module,$(ALL_MODULES),$(uninstall_tls_$(module))) uninstall_tls: $(foreach subdomain,$(ALL_SUBDOMAINS),$(uninstall_tls_$(subdomain)))
.PHONY: install_certbot .PHONY: install_certbot
install_certbot: /usr/bin/certbot /usr/bin/python /usr/lib/$(shell ls /usr/bin | grep python[0-9]\\.)/certbot_nginx install_certbot: /usr/bin/certbot /usr/bin/python /usr/lib/$(shell ls /usr/bin | grep python[0-9]\\.)/certbot_nginx
make/vars.mk
+1
View File
@@ -51,6 +51,7 @@ $(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \
$(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \ $(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \
export HOST_$(module) := $(if $(filter $(HOSTNAME),$(hostname)),127.0.0.1,$(IP_ADDR_$(hostname)))))) export HOST_$(module) := $(if $(filter $(HOSTNAME),$(hostname)),127.0.0.1,$(IP_ADDR_$(hostname))))))
ALL_SUBDOMAINS := $(foreach module,$(ALL_MODULES),$(SUBDOMAIN_$(module)))
SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module))) SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module)))
NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module))) NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module)))