From f11ddb8352718e4f1505dc0c79388bbc2ace4967 Mon Sep 17 00:00:00 2001 From: Junwei Zhao Date: Wed, 7 Apr 2021 23:15:45 +1000 Subject: [PATCH] #158 Update url paths for ariaNg and filebrowser --- Caddyfile | 19 +++++++++++-------- Procfile | 2 +- README.CN.md | 8 ++++---- README.md | 8 ++++---- SecureCaddyfile | 35 +++++++++++++++++++---------------- 5 files changed, 39 insertions(+), 33 deletions(-) diff --git a/Caddyfile b/Caddyfile index 14a351a..9eb0adf 100644 --- a/Caddyfile +++ b/Caddyfile @@ -4,22 +4,25 @@ {$DOMAIN} -redir /ui /ui/ 301 +redir /ui / 301 +redir /ui/ / 301 redir /rclone /rclone/ 301 +redir /files /files/ 301 + +reverse_proxy /jsonrpc 127.0.0.1:6800 route /rclone/* { uri strip_prefix /rclone - reverse_proxy http://localhost:5572 + reverse_proxy 127.0.0.1:5572 } -route /ui/* { - uri strip_prefix /ui - root * /usr/local/www/aria2 - file_server +route /files/* { + uri strip_prefix /files + reverse_proxy 127.0.0.1:8080 } -reverse_proxy 127.0.0.1:8080 -reverse_proxy /jsonrpc 127.0.0.1:6800 +root * /usr/local/www/aria2 +file_server encode gzip log { diff --git a/Procfile b/Procfile index f0e2baa..fa2fb26 100644 --- a/Procfile +++ b/Procfile @@ -1,4 +1,4 @@ -filebrowser: /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data +filebrowser: /app/filebrowser -p 8080 -d /app/filebrowser.db -r /data -b /files caddy: /app/caddy.sh aria2c: /app/aria2c.sh rclone: /app/rclone.sh diff --git a/README.CN.md b/README.CN.md index 73fcda8..9afc353 100644 --- a/README.CN.md +++ b/README.CN.md @@ -40,7 +40,7 @@ File Browser * 自动 HTTPS （Let's Encrypt） * 支持绑定自定义用户ID，可以主机上的非`root`用户，也可以管理下载的文件 * Basic Auth 用户认证 - * 文件管理和视频播放 ([File Browser](https://filebrowser.xyz/)，注意默认情况下，只能访问和管理 `/data` 目录下的文件) + * 文件管理和视频播放 ([FileBrowser](https://filebrowser.xyz/)，注意默认情况下，只能访问和管理 `/data` 目录下的文件) * 支持ARM CPU 架构，因此可以在树莓派等设备上运行， ## 推荐使用的docker image tag @@ -57,10 +57,10 @@ File Browser docker buildx build --platform linux/arm/v7,linux/arm64,linux/amd64 -t aria2-ui . ``` -* Aria2: -* FileManger: +* Aria2: +* Filebrowser: * Rclone: -* 请使用 admin/admin 进行登录, 在如果没有修改`ARIA2_USER`,`ARIA2_PWD`的情况下，请使用`user`/`password`登录`Rclone` +* 请使用 admin/admin 进行登录Filebrowser, 在如果没有修改`ARIA2_USER`,`ARIA2_PWD`的情况下，请使用`user`/`password`登录`Rclone` ### 开启所有功能 ```bash docker run -d --name ariang \ diff --git a/README.md b/README.md index c73a077..d6fe879 100644 --- a/README.md +++ b/README.md @@ -63,10 +63,10 @@ File Browser docker run -d --name aria2-ui -p 80:80 wahyd4/aria2-ui ``` -* Aria2: -* FileManger: +* Aria2: +* FileManger: * Rclone: -* Please use `admin`/`admin` as username and password to login for the first time, and `user`/`password` to login `Rclone` if you don't update `ARIA2_USER` and `ARIA2_PWD` +* Please use `admin`/`admin` as username and password to login `Filebrowser` for the first time. And use `user`/`password` to login `Rclone` if you don't update `ARIA2_USER` and `ARIA2_PWD` ### Full features run @@ -81,7 +81,7 @@ File Browser -e DOMAIN=https://example.com \ -e ARIA2_SSL=false \ -e ARIA2_USER=user \ - -e ARIA2_PWD=pwd \ + -e ARIA2_PWD=password \ -e ARIA2_EXTERNAL_PORT=443 \ -v /yourdata:/data \ -v /app/a.db:/app/filebrowser.db \ diff --git a/SecureCaddyfile b/SecureCaddyfile index c850be8..c60853a 100644 --- a/SecureCaddyfile +++ b/SecureCaddyfile @@ -4,27 +4,30 @@ {$DOMAIN} -redir /ui /ui/ 301 -redir /rclone /rclone/ 301 - -route /rclone/* { - uri strip_prefix /rclone - reverse_proxy http://localhost:5572 -} - -route /ui/* { - uri strip_prefix /ui - root * /usr/local/www/aria2 - file_server -} - -basicauth /ui/* { +basicauth /* { ARIA2_USER ARIA2_PWD_ENCRYPT } -reverse_proxy 127.0.0.1:8080 +redir /ui / 301 +redir /ui/ / 301 +redir /rclone /rclone/ 301 +redir /files /files/ 301 + reverse_proxy /jsonrpc 127.0.0.1:6800 +route /rclone/* { + uri strip_prefix /rclone + reverse_proxy 127.0.0.1:5572 +} + +route /files/* { + uri strip_prefix /files + reverse_proxy 127.0.0.1:8080 +} + +root * /usr/local/www/aria2 +file_server + encode gzip log { output stderr