From 794caaecdcb3302eb086503fc19417f197fb8fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E4=BC=9F?= <624371359@qq.com> Date: Mon, 13 May 2019 15:49:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BT=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=85=A8=E9=80=9F=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0bt=E4=B8=8B=E8=BD=BD=E5=92=8CDHT=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/aria2/scripts/aria2.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/aria2/scripts/aria2.sh b/apps/aria2/scripts/aria2.sh index cc194c3..c20e76a 100644 --- a/apps/aria2/scripts/aria2.sh +++ b/apps/aria2/scripts/aria2.sh @@ -9,6 +9,11 @@ WEBDIR=${mbroot}/apps/${appname}/web aria2url=http://$lanip/backup/log/${appname} binname=aria2c +open_ports() { + # 添加bt下载和DHT监听端口 + open_port 6881:6999 tcp +} + set_config() { logsh "【$service】" "加载${appname}配置..." From d3c75609d5aad80b428809cf7e597894abdcc74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E4=BC=9F?= <624371359@qq.com> Date: Mon, 13 May 2019 15:54:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BT=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=85=A8=E9=80=9F=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0DHT=E7=BC=93=E5=AD=98=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=92=8Cbt-tracker=E5=B1=9E=E6=80=A7=EF=BC=8Cscripts=E9=87=8C?= =?UTF-8?q?=E5=A5=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/aria2/config/aria2.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/aria2/config/aria2.conf b/apps/aria2/config/aria2.conf index e0b1d75..82c607a 100644 --- a/apps/aria2/config/aria2.conf +++ b/apps/aria2/config/aria2.conf @@ -42,6 +42,11 @@ max-upload-limit=0 #referer=* #文件保存路径, 默认为当前启动位置 dir=/extdisks/sda1/下载 +#IPv4 DHT routing table file to PATH(IPV6默认没有打开的) +#dht-file-path=/extdisks/sda1/下载/.aria2/dht.dat +#dht-file-path6=/extdisks/sda1/下载/.aria2/dht6.dat +#bt-tracker +#bt-tracker= #文件缓存, 使用内置的文件缓存, 如果你不相信Linux内核文件缓存和磁盘内置缓存时使用, 需要1.16及以上版本 #disk-cache=0 #另一种Linux文件缓存方式, 使用前确保您使用的内核支持此选项, 需要1.15及以上版本(?) @@ -55,4 +60,4 @@ check-certificate=false input-file=/etc/aria2.session save-session=/etc/aria2.session save-session-interval=60 -log-level=warn \ No newline at end of file +log-level=warn From 08aebcdfbfd3192c4073c02ef693b983a938c645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E4=BC=9F?= <624371359@qq.com> Date: Mon, 13 May 2019 16:06:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BT=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=85=A8=E9=80=9F=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0bt-tracker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/aria2/scripts/aria2.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/aria2/scripts/aria2.sh b/apps/aria2/scripts/aria2.sh index c20e76a..575a000 100644 --- a/apps/aria2/scripts/aria2.sh +++ b/apps/aria2/scripts/aria2.sh @@ -31,6 +31,13 @@ set_config() { [ ! -d "$path" ] && mkdir -p $path + # 自动更新bt-tracker + list=`curl -s https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt|awk NF|sed ":a;N;s/\n/,/g;ta"` + if [ ! -z "${list}" ]; then + sed -i "s#.*bt-tracker.*#bt-tracker=${list}#" ${mbroot}/apps/${appname}/config/${appname}.conf + logsh "【$service】" "更新bt-tracker" + fi + #R3加载库文件 [ "$xq" == "R3" -o "$xq" == "R1CM" ] && export LD_LIBRARY_PATH=${mbroot}/apps/${appname}/lib:/usr/lib:/lib From f8affa84266eac74eff4a5b48798a6e3feaea42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E4=BC=9F?= <624371359@qq.com> Date: Mon, 13 May 2019 16:20:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BT=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=85=A8=E9=80=9F=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?DHT=20=E7=BC=93=E5=AD=98=E7=9B=AE=E5=BD=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 没有测试过,我本地直接创建了DHT目录,代码直接参照你的代码写的,应该没有问题 --- apps/aria2/scripts/aria2.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/aria2/scripts/aria2.sh b/apps/aria2/scripts/aria2.sh index 575a000..3f9b7c3 100644 --- a/apps/aria2/scripts/aria2.sh +++ b/apps/aria2/scripts/aria2.sh @@ -31,6 +31,14 @@ set_config() { [ ! -d "$path" ] && mkdir -p $path + # DHT 缓存目录配置 + if [ ! -d "${path}/.aria2" ]; then + mkdir -p "${path}/.aria2" + # IPV6默认没有开,可以不用配置 + sed -i "s#.*dht-file-path.*#dht-file-path=${path}/.aria2/dht.dat#" ${mbroot}/apps/${appname}/config/${appname}.conf + sed -i "s#.*dht-file-path6.*#dht-file-path6=${path}/.aria2/dht6.dat#" ${mbroot}/apps/${appname}/config/${appname}.conf + fi + # 自动更新bt-tracker list=`curl -s https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt|awk NF|sed ":a;N;s/\n/,/g;ta"` if [ ! -z "${list}" ]; then