From 734b965e12ce7e5e5d89adbb35b417480586cb61 Mon Sep 17 00:00:00 2001 From: Linux User Date: Mon, 8 May 2023 18:29:20 +0200 Subject: [PATCH] feat: caldan's acme_rsync turned into just acme_refresh --- caladan/{acme_rsync => acme_refresh}/Makefile | 29 ++----------------- caladan/{acme_rsync => acme_refresh}/run.sh | 0 2 files changed, 2 insertions(+), 27 deletions(-) rename caladan/{acme_rsync => acme_refresh}/Makefile (72%) rename caladan/{acme_rsync => acme_refresh}/run.sh (100%) diff --git a/caladan/acme_rsync/Makefile b/caladan/acme_refresh/Makefile similarity index 72% rename from caladan/acme_rsync/Makefile rename to caladan/acme_refresh/Makefile index 987e56d..7822153 100644 --- a/caladan/acme_rsync/Makefile +++ b/caladan/acme_refresh/Makefile @@ -1,11 +1,11 @@ -WD=/var/lib/dags/acme_rsync +WD=/var/lib/dags/acme_refresh .PHONY: all refresh_pg sync_certs NGINX_RELOAD=$(WD)/nginx_reload PROSODY_RELOAD=$(WD)/prosody_reload -all: sync_certs $(NGINX_RELOAD) $(PROSODY_RELOAD) refresh_pg +all: $(NGINX_RELOAD) $(PROSODY_RELOAD) refresh_pg ############################################################################### @@ -16,31 +16,6 @@ FULLCHAIN=$(CERT_PATH)/fullchain.cer CERT=$(CERT_PATH)/$(DOMAIN).cer KEY=$(CERT_PATH)/$(DOMAIN).key -############################################################################### -# Sync the certificates using rsync. Because `sync` is a phony -# target, it will be run each time, but the certificate files will only be -# updated if a renewal happens - -$(FULLCHAIN): sync_certs -$(CERT): sync_certs -$(KEY): sync_certs - -RSYNCD_HOST=10.0.24.106 -RSYNCD_USER=user -RSYNCD_PASSWORD=/srv/secrets/rsyncd_password - -REMOTE_ACME_PATH=rsync://$(RSYNCD_USER)@$(RSYNCD_HOST)/acme -RSYNC_OPTS=--archive --delete --acls --xattrs --compress --verbose --human-readable - -sync_certs: - mkdir -p $(ACME_DIR) - @echo "running rsync" - rsync \ - --password-file $(RSYNCD_PASSWORD) \ - $(RSYNC_OPTS) \ - $(REMOTE_ACME_PATH) \ - $(ACME_DIR) - ############################################################################### # Reload the nginx instance running on my reverse proxy docker-compose service # so that it uses the new certificates. diff --git a/caladan/acme_rsync/run.sh b/caladan/acme_refresh/run.sh similarity index 100% rename from caladan/acme_rsync/run.sh rename to caladan/acme_refresh/run.sh