From 9a83d2192e7e8c74f2738e52e994b46e63a5eae6 Mon Sep 17 00:00:00 2001 From: bouni Date: Wed, 18 May 2022 09:22:09 +0000 Subject: [PATCH 1/3] Add openssh to Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 8005c23..eba6ecf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM alpine:edge RUN apk --no-cache add \ + openssh \ libressl \ lftp \ bash From 6dd895b3a02e21be73e2aedf0fc80bdecb167b6c Mon Sep 17 00:00:00 2001 From: bouni Date: Wed, 18 May 2022 09:22:49 +0000 Subject: [PATCH 2/3] add PLUGIN_DEBUG and PLUGIN_AUTO_CONFIRM options --- upload.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/upload.sh b/upload.sh index 2927f7e..b3aca91 100755 --- a/upload.sh +++ b/upload.sh @@ -38,6 +38,18 @@ else PLUGIN_CLEAN_DIR="" fi +if [ -z "$PLUGIN_DEBUG" ]; then + PLUGIN_DEBUG="" +else + PLUGIN_DEBUG="-d" +fi + +if [ -n "$PLUGIN_AUTO_CONFIRM" ]; then + PLUGIN_AUTO_CONFIRM="true" +else + PLUGIN_AUTO_CONFIRM="false" +fi + PLUGIN_EXCLUDE_STR="" PLUGIN_INCLUDE_STR="" @@ -50,10 +62,11 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -i '$i'" done -lftp -e "set xfer:log 1; \ +lftp $PLUGIN_DEBUG -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 sftp:auto-confirm $PLUGIN_AUTO_CONFIRM; \ set ssl:verify-certificate $PLUGIN_VERIFY; \ set ssl:check-hostname $PLUGIN_VERIFY; \ set net:max-retries 3; \ From 28fecde917f4196a2c84bf1ac5b837235d75ca84 Mon Sep 17 00:00:00 2001 From: bouni Date: Wed, 18 May 2022 09:26:46 +0000 Subject: [PATCH 3/3] Extended README with missing and new options --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8af833c..80e8177 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,10 @@ environment: PLUGIN_VERIFY: false PLUGIN_EXCLUDE: (egrep like pattern matching) PLUGIN_INCLUDE: (egrep like pattern matching) + PLUGIN_CHMOD: true | false (default true) + PLUGIN_CLEAN_DIR: true | false (default false) + PLUGIN_AUTO_CONFIRM: true | false (default false) + PLUGIN_DEBUG: true | false (default false) ``` ## Full file example