From fc60aa17ebbf33e3f8d24e1bd77b151cac1a237e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 23 Jul 2021 16:34:45 +0100 Subject: [PATCH] Update upload arrangements a bit --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 72109fe1..e9117bec 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,14 @@ OUTPUTDIR=$(BASEDIR)/output CONFFILE=$(BASEDIR)/pelicanconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py -SSH_HOST=chiark-external +SSH_HOST=chiark-ext SSH_PORT=22 SSH_USER=cjwatson SSH_TARGET_DIR=public-html/blog/ +BACKUP_SSH_HOST=riva +BACKUP_SSH_TARGET_DIR=public_html/blog/ + DEBUG ?= 0 ifeq ($(DEBUG), 1) PELICANOPTS += -D @@ -69,7 +72,13 @@ publish: ssh_upload: publish scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) +backup_ssh_upload: publish + scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(BACKUP_SSH_HOST):$(BACKUP_SSH_TARGET_DIR) + rsync_upload: publish rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude +backup_rsync_upload: publish + rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(BACKUP_SSH_HOST):$(BACKUP_SSH_TARGET_DIR) --cvs-exclude + .PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload -- 2.30.2