diff --git a/README.md b/README.md index ba34b40..084f657 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,8 @@ pipeline: image: cschlosser/drone-ftps hostname: example.com:21 secrets: [ ftp_username, ftp_password ] - secure: true + secure: true (default) | false # true = use FTP(S), false = FTP without SSL + verify: true (default) | false # true = strong SSL verification, false = supress SSL verification error dest_dir: /var/www/mysite src_dir: /mysite/static exclude: diff --git a/upload.sh b/upload.sh index 314043d..bee73a8 100755 --- a/upload.sh +++ b/upload.sh @@ -14,6 +14,10 @@ if [ -z "$PLUGIN_SECURE" ]; then PLUGIN_SECURE="true" fi +if [ -z "$PLUGIN_VERIFY" ]; then + PLUGIN_VERIFY="true" +fi + if [ -z "$PLUGIN_DEST_DIR" ]; then PLUGIN_DEST_DIR="/" fi @@ -34,4 +38,11 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -x $i" done -lftp -e "set xfer:log 1; set ftp:ssl-force $PLUGIN_SECURE; set ftp:ssl-protect-data $PLUGIN_SECURE; set ftp:ssl-allow $PLUGIN_SECURE; mirror -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" -u $FTP_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME +lftp -e "set xfer:log 1; \ + set ftp:ssl-allow $PLUGIN_SECURE; \ + set ftp:ssl-force $PLUGIN_SECURE; \ + set ftp:ssl-protect-data $PLUGIN_SECURE; \ + set ssl:verify-certificate $PLUGIN_VERIFY; \ + set ssl:check-hostname $PLUGIN_VERIFY; \ + mirror --verbose -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" \ + -u $FTP_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME