From 9f3d0402cca5906b3d283b02f6b12e0654b9a17c Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Fri, 2 Jun 2023 17:57:38 +0200 Subject: [PATCH] feat: refactored LB structure --- narwhal/acme_renew/Makefile | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/narwhal/acme_renew/Makefile b/narwhal/acme_renew/Makefile index df4f18f..8357ec5 100644 --- a/narwhal/acme_renew/Makefile +++ b/narwhal/acme_renew/Makefile @@ -6,15 +6,13 @@ NGINX_RELOAD=$(WD)/nginx_reload CALADAN_SYNC=$(WD)/caladan_sync FUGU_SYNC=$(WD)/fugu_sync -PIKVM_SYNC=$(WD)/pikvm_sync LB_SYNC=$(WD)/lb_sync CALADAN_TRIGGER=$(WD)/caladan_trigger FUGU_TRIGGER=$(WD)/fugu_trigger -PIKVM_TRIGGER=$(WD)/pikvm_trigger LB_TRIGGER=$(WD)/lb_trigger -all: renew_certs $(CALADAN_TRIGGER) $(FUGU_TRIGGER) $(PIKVM_TRIGGER) $(LB_TRIGGER) $(NGINX_RELOAD) refresh_pg +all: renew_certs $(CALADAN_TRIGGER) $(FUGU_TRIGGER) $(LB_TRIGGER) $(NGINX_RELOAD) refresh_pg ############################################################################### @@ -98,20 +96,11 @@ $(LB_SYNC): $(FULLCHAIN) $(CERT) $(KEY) $(RSYNC_ARGS) \ --rsync-path="doas rsync" \ $^ \ - dags@lb:$(CERT_PATH) + dags@lb:/etc/nginx/$(DOMAIN) touch $@ KVMD_PST_DATA=/var/lib/kvmd/pst/data -$(PIKVM_SYNC): $(FULLCHAIN) $(CERT) $(KEY) - mkdir -p $(@D) - rsync \ - $(RSYNC_ARGS) \ - --rsync-path="doas kvmd-pstrun -- rsync" \ - $^ \ - dags@pikvm:$(KVMD_PST_DATA)/acme/$(DOMAIN) - touch $@ - define remote_dag_trigger mkdir -p $(@D) ssh -i $(SSH_KEY) dags@$(1) "doas /srv/dags/$(1)/$(2)/run.sh" @@ -124,9 +113,6 @@ $(CALADAN_TRIGGER): $(CALADAN_SYNC) $(FUGU_TRIGGER): $(FUGU_SYNC) $(call remote_dag_trigger,fugu,acme_refresh) -$(PIKVM_TRIGGER): $(PIKVM_SYNC) - $(call remote_dag_trigger,pikvm,acme_refresh) - $(LB_TRIGGER): $(LB_SYNC) $(call remote_dag_trigger,lb,acme_refresh)