+sftp added

-ssh/rsync/ftp purged

Makefile

@@ -8,10 +8,10 @@ OUTPUTDIR=$(CURDIR)/public
 CONFFILE=$(BASEDIR)/pelicanconf.py
 PUBLISHCONF=$(BASEDIR)/publishconf.py
 
-SSH_HOST=https://nosignal.hopto.org
+SSH_HOST=nosignal.hopto.org
 SSH_PORT=22
 SSH_USER=my_webapp
-SSH_TARGET_DIR=/var/www/losttrain/
+SSH_TARGET_DIR=/var/www/my_webapp/www/losttrain/
 
 
 DEBUG ?= 0
@@ -37,6 +37,7 @@ help:
 	@echo '   make devserver [PORT=8000]          serve and regenerate together      '
 	@echo '   make ssh_upload                     upload the web site via SSH        '
 	@echo '   make rsync_upload                   upload the web site via rsync+ssh  '
+	@echo '   make ftp_upload                     upload the web site via FTP        '
 	@echo '                                                                          '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html   '
 	@echo 'Set the RELATIVE variable to 1 to enable relative urls                    '
@@ -76,11 +77,7 @@ endif
 publish:
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 
-ssh_upload: publish
-	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+sftp_upload: publish
+	printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
-rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --cvs-exclude --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
-
-
-.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload
+.PHONY: html help clean regenerate serve serve-global devserver publish sftp_upload