From f73c3e587edded669e3125d4987f55f1ddbf4035 Mon Sep 17 00:00:00 2001 From: EricClaeys <83164203+EricClaeys@users.noreply.github.com> Date: Thu, 6 Jan 2022 21:39:49 -0600 Subject: [PATCH 1/2] upload.sh: add newline to help msg Add "ftps" to comment --- scripts/upload.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upload.sh b/scripts/upload.sh index ab349c6a2..5eede8f9a 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -37,7 +37,7 @@ if [ $# -lt 3 ] ; then echo " 'local_directory' is the name of an optional local directory the file should be" echo " copied to in addition to being uploaded." echo - echo -n "For example: ${ME} keogram-20210710.jpg /keograms keogram.jpg" + echo "For example: ${ME} keogram-20210710.jpg /keograms keogram.jpg" exit 1 fi FILE_TO_UPLOAD="${1}" @@ -90,7 +90,7 @@ elif [[ ${PROTOCOL} == "local" ]] ; then cp "${FILE_TO_UPLOAD}" "${REMOTE_DIR}/${DESTINATION_FILE}" RET=$? -else # sftp/ftp +else # sftp/ftp/ftps # People sometimes have problems with ftp not working, # so save the commands we use so they can run lftp manually to debug. From 1d48bdc2a0dd05f86fa52cd7f9d4c1dc7860a2e4 Mon Sep 17 00:00:00 2001 From: EricClaeys <83164203+EricClaeys@users.noreply.github.com> Date: Thu, 6 Jan 2022 21:44:22 -0600 Subject: [PATCH 2/2] ftp-settings.sh.repo - add ftps ftps == FTP secure --- config_repo/ftp-settings.sh.repo | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config_repo/ftp-settings.sh.repo b/config_repo/ftp-settings.sh.repo index 67955604f..f67fd4151 100755 --- a/config_repo/ftp-settings.sh.repo +++ b/config_repo/ftp-settings.sh.repo @@ -6,8 +6,10 @@ # "local" copies to a location on your Pi. # "ftp" uploads to an FTP server. # See the section for ftp PROTOCOL below. + # "ftps" uploads to an FTP server that supports secure FTP transfer. + # *** Use "ftps" instead of "ftp" if you can - it's more secure than ftp. *** + # See the section for ftp PROTOCOL below. # "sftp" (SSH file transfer) - uploads to an FTP server that supports secure transfer. - # Use "sftp" instead of "ftp" if you can - it's more secure. # See the section for sftp PROTOCOL below. # "scp" (secure copy) - copies to a remote server. # See the section for scp PROTOCOL below. NOTE: "scp" PROTOCOL IS NOT IMPLEMENTED YET. @@ -67,7 +69,7 @@ IMGDIR="${IMAGE_DIR}" MP4DIR="${VIDEOS_DIR}" -############### ftp, sftp, and scp PROTOCOLS only: +############### ftp, ftps, sftp, and scp PROTOCOLS only: # Enter the name of the remote server. If you don't know it, ask your service provider. REMOTE_HOST=""