Improvment URL path requires tailing splash thing https://github.com/wahyd4/aria2-ariang-x-docker-compose/issues/65

caddy/Caddyfile

@@ -8,6 +8,10 @@
 }
 
 {$DOMAIN}/aria2 {
+  redir / /aria2/ 301
+}
+
+{$DOMAIN}/aria2/ {
   root /usr/local/www/aria2
   timeouts none
   gzip

caddy/Dockerfile

@@ -5,14 +5,14 @@ WORKDIR /root
 
 ENV RPC_SECRET=Hello
 ENV ENABLE_AUTH=false
-ENV DOMAIN=localhost:80
+ENV DOMAIN=:80
 ENV ARIA2_USER=user
 ENV ARIA2_PWD=password
 
-# For build image in local quickly
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+# For build image in local quickly in China
+# RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 
-RUN apk update && apk add wget bash curl openrc screen aria2 tar --no-cache
+RUN apk update && apk add wget bash curl gnupg openrc screen aria2 tar --no-cache
 
 ADD conf /root/conf
 
@@ -23,9 +23,10 @@ RUN mkdir -p /usr/local/www && mkdir -p /usr/local/www/aria2
 
 #AriaNg
 RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \
- && wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/0.2.0/aria-ng-0.2.0.zip && unzip aria-ng-0.2.0.zip && rm -rf aria-ng-0.2.0.zip \
- && chmod -R 755 /usr/local/www/aria2 \
- && chmod +x /root/conf/aria2c.sh
+  && chmod +rw /root/conf/aria2.session \
+  && wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/1.0.0/AriaNg-1.0.0.zip && unzip AriaNg-1.0.0.zip && rm -rf AriaNg-1.0.0.zip \
+  && chmod -R 755 /usr/local/www/aria2 \
+  && chmod +x /root/conf/aria2c.sh
 
 #The folder to store ssl keys
 VOLUME /root/conf/key

caddy/SecureCaddyfile

@@ -6,10 +6,13 @@
     log stdout
     errors stdout
 
-    basicauth / {$ARIA2_USER} {$ARIA2_PWD}
 }
 
 {$DOMAIN}/aria2 {
+  redir / /aria2/ 301
+}
+
+{$DOMAIN}/aria2/ {
   root /usr/local/www/aria2
   timeouts none
   gzip

caddy/conf/aria2.conf

@@ -36,8 +36,8 @@ max-upload-limit=0
 #验证用，需要1.16.1之后的release版本
 #referer=*
 #文件保存路径, 默认为当前启动位置
-# dir=/user-files/superuser/
-dir=/var/www
+dir=/user-files/superuser/
+# dir=/var/www
 #文件缓存, 使用内置的文件缓存, 如果你不相信Linux内核文件缓存和磁盘内置缓存时使用, 需要1.16及以上版本
 #disk-cache=0
 #另一种Linux文件缓存方式, 使用前确保您使用的内核支持此选项, 需要1.15及以上版本(?)
@@ -47,5 +47,18 @@ dir=/var/www
 file-allocation=prealloc
 
 # General Options
-log=var/log/aria2.log
-log-level=info
+log=/var/log/aria2.log
+#You can set either debug, info, notice, warn or error.
+log-level=error
+
+
+## 进度保存相关 ##
+# 从会话文件中读取下载任务
+input-file=/root/conf/aria2.session
+# 在Aria2退出时保存`错误/未完成`的下载任务到会话文件
+save-session=/root/conf/aria2.session
+# 定时保存会话, 0为退出时才保存, 需1.16.1以上版本, 默认:0
+save-session-interval=10
+
+# BT trackers from https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt
+bt-tracker=udp://tracker.coppersurfer.tk:6969/announce,udp://tracker.open-internet.nl:6969/announce,udp://tracker.leechers-paradise.org:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://tracker.internetwarriors.net:1337/announce,udp://9.rarbg.to:2710/announce,udp://exodus.desync.com:6969/announce,udp://tracker1.itzmx.com:8080/announce,http://tracker3.itzmx.com:6961/announce,udp://explodie.org:6969/announce,udp://tracker2.itzmx.com:6961/announce,udp://tracker.torrent.eu.org:451/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.port443.xyz:6969/announce,udp://thetracker.org:80/announce,udp://open.demonii.si:1337/announce,udp://ipv4.tracker.harry.lu:80/announce,udp://denis.stalker.upeer.me:6969/announce,udp://bt.xxx-tracker.com:2710/announce,http://tracker4.itzmx.com:2710/announce

nginx/Dockerfile

@@ -1,29 +0,0 @@
-FROM nginx:alpine
-MAINTAINER junv<wahyd4@gmail.com>
-
-# For build image in local quickly
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
-
-RUN apk update && apk add wget bash curl openrc screen aria2 tar --no-cache
-
-COPY aria2.conf /root
-COPY aria2c.sh /root
-
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY conf.d/ /etc/nginx/conf.d/
-
-RUN mkdir -p /usr/local/www && mkdir -p /usr/local/www/aria2
-
-#AriaNg
-RUN mkdir /usr/local/www/aria2/Download && cd /usr/local/www/aria2 \
- && wget -N --no-check-certificate https://github.com/mayswind/AriaNg/releases/download/0.2.0/aria-ng-0.2.0.zip && unzip aria-ng-0.2.0.zip && rm -rf aria-ng-0.2.0.zip \
- && chmod -R 755 /usr/local/www/aria2 \
- && chmod +x /root/aria2c.sh
-
- # forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
-
-EXPOSE 6800 80
-
-CMD ["sh", "/root/aria2c.sh" ]
-

nginx/aria2.conf

@@ -1,50 +0,0 @@
-#用户名
-#rpc-user=user
-#密码
-#rpc-passwd=passwd
-#上面的认证方式不建议使用,建议使用下面的token方式
-#设置加密的密钥
-#rpc-secret=token
-#允许rpc
-enable-rpc=true
-#允许所有来源, web界面跨域权限需要
-rpc-allow-origin-all=true
-#允许外部访问，false的话只监听本地端口
-rpc-listen-all=true
-#RPC端口, 仅当默认端口被占用时修改
-#rpc-listen-port=6800
-#最大同时下载数(任务数), 路由建议值: 3
-max-concurrent-downloads=5
-#断点续传
-continue=true
-#同服务器连接数
-max-connection-per-server=5
-#最小文件分片大小, 下载线程数上限取决于能分出多少片, 对于小文件重要
-min-split-size=10M
-#单文件最大线程数, 路由建议值: 5
-split=10
-#下载速度限制
-max-overall-download-limit=0
-#单文件速度限制
-max-download-limit=0
-#上传速度限制
-max-overall-upload-limit=0
-#单文件速度限制
-max-upload-limit=0
-#断开速度过慢的连接
-#lowest-speed-limit=0
-#验证用，需要1.16.1之后的release版本
-#referer=*
-#文件保存路径, 默认为当前启动位置
-dir=/user-files/superuser/
-#文件缓存, 使用内置的文件缓存, 如果你不相信Linux内核文件缓存和磁盘内置缓存时使用, 需要1.16及以上版本
-#disk-cache=0
-#另一种Linux文件缓存方式, 使用前确保您使用的内核支持此选项, 需要1.15及以上版本(?)
-#enable-mmap=true
-#文件预分配, 能有效降低文件碎片, 提高磁盘性能. 缺点是预分配时间较长
-#所需时间 none < falloc ? trunc « prealloc, falloc和trunc需要文件系统和内核支持
-file-allocation=prealloc
-
-# General Options
-# log=var/log/aria2.log
-# log-level=info

nginx/aria2c.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-echo "Run aria2c and ariaNG"
-/usr/bin/aria2c --conf-path="/root/aria2.conf" -D --enable-rpc --rpc-listen-all \
-&& nginx -g 'daemon off;'

nginx/conf.d/default.conf

@@ -1,32 +0,0 @@
-server{
-    # server_name localhost;
-    listen 80;
-    client_max_body_size 10240M;
-
-
-    location  / {
-        proxy_pass http://file-manager-server;
-        proxy_set_header Host $http_host;
-        client_max_body_size 10240M;
-    }
-
-   location /aria2 {
-      # try_files $uri $uri/ /index.html;
-        root /usr/local/www/;
-        index index.html index.htm;
-        proxy_set_header Host $http_host;
-    }
-
-    # location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc|css|js|woff2)$ {
-    #   expires 24h;
-    #   access_log off;
-    #   add_header Cache-Control "public";
-    # }
-
-
-}
-
-
-upstream file-manager-server {
-  server file-manager;
-}

nginx/nginx.conf

@@ -1,30 +0,0 @@
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-    server_names_hash_bucket_size 128;
-    include /etc/nginx/conf.d/*.conf;
-}