Update upload arrangements a bit

diff --git a/Makefile b/Makefile
index 72109fe17d8b6dc6833b95c5d90a79fad8d82499..e9117beca64c1f8bcd74f6c3e5c34d34eaaecca2 100644 (file)
--- 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