From 72421d443844e8bf7e79d76baa8766d0a7a59c8a Mon Sep 17 00:00:00 2001
From: Justin Mayer <entrop@gmail.com>
Date: Thu, 5 Jul 2012 11:34:45 -0700
Subject: [PATCH] Support arbitrary SSH ports in pelican-quickstart

Some folks choose non-standard SSH ports for security reasons, so it
makes sense to try to support that in the pelican-quickstart script.
---
 pelican/tools/pelican_quickstart.py | 2 ++
 pelican/tools/templates/Makefile.in | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py
index cfd9bb4c..b5da8926 100755
--- a/pelican/tools/pelican_quickstart.py
+++ b/pelican/tools/pelican_quickstart.py
@@ -19,6 +19,7 @@ CONF = {
     'ftp_user': 'anonymous',
     'ftp_target_dir': '/',
     'ssh_host': 'locahost',
+    'ssh_port': 22,
     'ssh_user': 'root',
     'ssh_target_dir': '/var/www',
     'dropbox_dir' : '~/Dropbox/Public/',
@@ -159,6 +160,7 @@ Please answer the following questions so this script can generate the files need
 
         if ask('Do you want to upload your website using SSH ?', answer=bool, default=False):
             CONF['ssh_host'] = ask('What is the hostname of your SSH server ?', str, CONF['ssh_host'])
+            CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])
             CONF['ssh_user'] = ask('What is your username on this server ?', str, CONF['ssh_user'])
             CONF['ssh_target_dir'] = ask('Where do you want to put your website on this server ?', str, CONF['ssh_target_dir'])
 
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 998d8c97..392336d7 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -11,6 +11,7 @@ FTP_USER=$ftp_user
 FTP_TARGET_DIR=$ftp_target_dir
 
 SSH_HOST=$ssh_host
+SSH_PORT=$ssh_port
 SSH_USER=$ssh_user
 SSH_TARGET_DIR=$ssh_target_dir
 
@@ -43,10 +44,10 @@ dropbox_upload: $$(OUTPUTDIR)/index.html
 	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
 
 ssh_upload: $$(OUTPUTDIR)/index.html
-	scp -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
+	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: $$(OUTPUTDIR)/index.html
-	rsync -e ssh -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvz --delete $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
 
 ftp_upload: $$(OUTPUTDIR)/index.html
 	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"