diff --git a/Caddyfile b/Caddyfile index 244cdce..5a24bf7 100644 --- a/Caddyfile +++ b/Caddyfile @@ -24,3 +24,16 @@ log stdout errors stdout } + +{$DOMAIN}/rclone { + redir / /rclone/ 301 +} + +{$DOMAIN}/rclone/ { + proxy / 127.0.0.1:5572/ { + transparent + } + + log stdout + errors stderr +} diff --git a/Dockerfile b/Dockerfile index f035626..ba05400 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,9 +34,17 @@ RUN adduser -D -u 1000 junv \ && rm -rf forego-stable-${platform}.tgz \ && mkdir -p /usr/local/www \ && mkdir -p /usr/local/www/aria2 \ - && rm -rf init /app/*.txt + && rm -rf init /app/*.txt \ + && curl -O https://downloads.rclone.org/rclone-current-linux-amd64.zip \ + && unzip rclone-current-linux-amd64.zip \ + && cd rclone-*-linux-amd64 \ + && cp rclone /usr/local/bin/ \ + && chown junv:junv /usr/local/bin/rclone \ + && chmod 755 /usr/local/bin/rclone \ + && rm /app/rclone-current-linux-amd64.zip \ + && rm -rf /app/rclone-*-linux-amd64 -ADD aria2c.sh caddy.sh Procfile init.sh start.sh /app/ +ADD aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh /app/ ADD conf /app/conf ADD Caddyfile SecureCaddyfile /usr/local/caddy/ diff --git a/Procfile b/Procfile index 7d5e959..f0e2baa 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,4 @@ filebrowser: /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data caddy: /app/caddy.sh aria2c: /app/aria2c.sh +rclone: /app/rclone.sh diff --git a/SecureCaddyfile b/SecureCaddyfile index 601455a..73efe10 100644 --- a/SecureCaddyfile +++ b/SecureCaddyfile @@ -8,6 +8,10 @@ websocket } + proxy /rclone 127.0.0.1:5572 { + transparent + } + gzip log stdout errors stdout @@ -26,3 +30,16 @@ basicauth / {$ARIA2_USER} {$ARIA2_PWD} } + +{$DOMAIN}/rclone { + redir / /rclone/ 301 +} + +{$DOMAIN}/rclone/ { + proxy / 127.0.0.1:5572/ { + transparent + } + + log stdout + errors stderr +} diff --git a/init.sh b/init.sh index aeb1f0c..0e7ed00 100755 --- a/init.sh +++ b/init.sh @@ -11,6 +11,7 @@ chown -R junv:junv \ /data chmod +x /app/caddy.sh \ + /app/rclone.sh \ /app/aria2c.sh echo "**** give caddy permissions to use low ports ****" diff --git a/rclone.sh b/rclone.sh new file mode 100755 index 0000000..ca697c9 --- /dev/null +++ b/rclone.sh @@ -0,0 +1,8 @@ +#! /bin/bash -eu + +echo "Start Rclone" +rclone rcd --rc-web-gui \ + --rc-web-gui-no-open-browser \ + --rc-addr :5572 \ + --rc-user $ARIA2_USER \ + --rc-pass $ARIA2_PWD