diff --git a/Makefile b/Makefile index d84d9ec..fd1ab69 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ $(foreach module,$(ALL_MODULES),$(eval $(call make_module_rule))) $(foreach module,$(ALL_MODULES),$(eval $(call module_env_rule))) .PHONY: install -install: install_nginx $(ENV_RULES) $(INSTALL_RULES) install_crontab +install: install_nginx install_tls $(ENV_RULES) $(INSTALL_RULES) install_crontab .PHONY: reinstall reinstall: reinstall_nginx reinstall_dyndns reinstall_tls $(ENV_RULES) $(REINSTALL_RULES) reinstall_crontab diff --git a/make/tls.mk b/make/tls.mk index cf203d6..72608a3 100644 --- a/make/tls.mk +++ b/make/tls.mk @@ -66,8 +66,13 @@ delete_cert_%: sudo chmod +x $@ certs_to_renew = $(foreach subdomain,$(filter $(SUBDOMAINS),$(installed_tls_cert_subdomains)),$(tls_cert)) +tls_crontabs_to_install = $(foreach subdomain,$(SUBDOMAINS),$(tls_crontab)) +tls_certs_to_install = $(foreach subdomain,$(SUBDOMAINS),$(tls_cert)) +.PHONY: install_tls +install_tls: $(tls_crontabs_to_install) $(tls_certs_to_install) $(addprefix remove_,$(tls_crontabs_to_remove)) $(addprefix delete_cert_,$(tls_cert_subdomains_to_delete)) $(addprefix renew_,$(certs_to_renew)) + .PHONY: reinstall_tls -reinstall_tls: $(addprefix remove_,$(tls_crontabs_to_remove)) $(addprefix delete_cert_,$(tls_cert_subdomains_to_delete)) $(addprefix renew_,$(certs_to_renew)) +reinstall_tls: install_tls .PHONY: uninstall_tls uninstall_tls: $(foreach subdomain,$(ALL_SUBDOMAINS),$(uninstall_tls_$(subdomain)))