From 612a9557a13e530a8601ba5a69b3cae118d39f5f Mon Sep 17 00:00:00 2001
From: Brendan Bartels <bbartels@iastate.edu>
Date: Sun, 20 Nov 2016 21:20:29 -0600
Subject: [PATCH] website: Disable ssh keys for lftp

---
 website/scripts/deploy.sh       | 32 ++++++++++----------------------
 website/scripts/sync_content.ex | 15 ---------------
 2 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 website/scripts/sync_content.ex

diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh
index 8223b8813..19f1813c8 100644
--- a/website/scripts/deploy.sh
+++ b/website/scripts/deploy.sh
@@ -21,27 +21,15 @@ fi
 PASSWORD=$(cat PASSWORD)
 
 chmod -R 755 output || exit 1
-#cd output || exit 1
-
-scripts/sync_content.ex $HOST $USERNAME $PASSWORD
-
-# (
-#   echo "
-#   ascii
-#   put -r output/ /www/
-#   close
-#   quit
-#     "
-# ) | sftp --password="$PASSWORD" "$USERNAME"@"$HOST"
-
-# lftp -e "open sftp://$HOST; user $USERNAME $PASSWORD; cd www; mirror -R --delete-first; exit"
-
-# lftp<<END_SCRIPT
-# open sftp://$HOST
-# user $USERNAME $PASSWORD
-# cd www
-# mirror -R --delete-first
-# exit
-# END_SCRIPT
+cd output || exit 1
+
+lftp<<END_SCRIPT
+set sftp:connect-program "ssh -a -x -o PubkeyAuthentication=false"
+open sftp://$HOST
+user $USERNAME $PASSWORD
+cd www
+mirror -R --delete-first
+exit
+END_SCRIPT
 
 echo "Website updated."
\ No newline at end of file
diff --git a/website/scripts/sync_content.ex b/website/scripts/sync_content.ex
deleted file mode 100644
index 4c185b1ea..000000000
--- a/website/scripts/sync_content.ex
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/expect
-
-set HOST [lindex $argv 0];
-set USERNAME [lindex $argv 1];
-set PASSWORD [lindex $argv 2];
-
-spawn sftp $USERNAME@$HOST
-expect "password:"
-send "$PASSWORD\n"
-expect "sftp>"
-send "put output/* www/\n"
-expect "sftp>"
-send "exit\n"
-
-close
-- 
GitLab