From 54fe7783a8d81a6e975ab841d6d537a5ca4c1549 Mon Sep 17 00:00:00 2001 From: Marvin Steadfast Date: Thu, 5 Mar 2020 13:30:50 +0100 Subject: [PATCH] first try to upload with rclone --- .drone.yml | 9 ++++++--- Makefile | 12 +++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 78bb460..0a1a6d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,10 +6,13 @@ steps: image: golang:1.14.0-alpine3.11 pull: always environment: - FTP_PASS: - from_secret: ftp_pass + RCLONE_CONF: + from_secret: rclone.conf commands: - - apk add --no-cache make + - apk add --no-cache make rclone + - mkdir -p ~/.config/rclone + - echo $RCLONE_CONF > ~/.config/rclone/rclone.conf + - cat ~/.config/rclone/rclone.conf - make install_deps - make build - make ftp_upload diff --git a/Makefile b/Makefile index 96b04ba..bda4c86 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,5 @@ -FTP_HOST=xsteadfastx.org/ -FTP_TARGET_DIR=/ -FTP_USER=xstead_0 HUGO_VERSION=0.65.3 -OUTPUTDIR=./public +OUTPUT_DIR=./public clean: rm -rf public @@ -17,9 +14,6 @@ install_deps: GO111MODULE=on go get -v -u github.com/gohugoio/hugo@v$(HUGO_VERSION) ftp_upload: - lftp ftp://$(FTP_USER):$(FTP_PASS)@$(FTP_HOST) -e "set ssl:verify-certificate no; mirror -R --ignore-time --no-perms --parallel=4 -e --use-cache -v $(OUTPUTDIR) $(FTP_TARGET_DIR); quit" + rclone sync $(OUTPUT_DIR) blog:// -ftp_upload_clean: - lftp ftp://$(FTP_USER):$(FTP_PASS)@$(FTP_HOST) -e "set ssl:verify-certificate no; mirror -R --no-perms --parallel=4 -e -v $(OUTPUTDIR) $(FTP_TARGET_DIR); quit" - -.PHONY: clean build install_deps ftp_upload ftp_upload_clean +.PHONY: clean build install_deps ftp_upload