Skip to content

Commit

Permalink
Release Version 27.0&19.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JACK-THINK committed Dec 13, 2023
1 parent 080e76c commit 310fbcb
Show file tree
Hide file tree
Showing 92 changed files with 1,220 additions and 4,450 deletions.
15 changes: 15 additions & 0 deletions ChangeLog_zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# 更新日志

## 版本27.0(2023-12-13)

#### 新增

1.

#### 变更

1. Entware_20230901发布,请参考使用手册升级系统
2. 更新entware

#### 删除

1.

## 版本26.0(2023-01-25)

#### 新增
Expand Down
50 changes: 50 additions & 0 deletions addons_ChangeLog_zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,55 @@
# 更新日志

## 版本19.00(2023-12-13)

#### 新增

1. 新增网络代理插件xray

#### 变更

1. 更新AdGuard Home
2. 更新ariang
3. 更新caddy
4. 更新filebrowser
5. 更新samba
6. 更新syncthing
7. 更新webdav

#### 删除

1. shadowsocks-libev
2. v2ray

#### 插件列表

| 插件名称 | 版本 | 简介 |
| ----------------- | -------- | --------------------------------------------------- |
| AdGuard Home | 在线安装 | AdGuard Home全网广告拦截与反跟踪软件 |
| ali_ddns | | 阿里云DDNS |
| aliyun-cli | 在线安装 | 全功能阿里云命令行工具 CLI(Alibaba Cloud CLI) |
| aria2 | 在线安装 | aria2下载工具 |
| ariang | 在线安装 | aria2图形界面 |
| bash | 在线安装 | 全功能bash shell |
| caddy | 在线安装 | Web服务器 |
| debian | 在线安装 | Debian的chroot环境。可安装Debian系统下大部分软件包 |
| filebrowser | 在线安装 | 私有云盘服务器 |
| freemem | | 自动清理内存工具 |
| he_ddns | | HE DDNS(DNS服务商为[HE.NET](https://dns.he.net/)|
| ipmitool | 在线安装 | IPMI管理工具(仅开通lan, lanplus接口) |
| mailx | 在线安装 | 邮件系统 |
| ntpd | 在线安装 | 授时服务器 |
| onu_access | | 允许访问光猫管理页面 |
| openssh_server | 在线安装 | OpenSSH服务器 |
| overture | 在线安装 | DNS服务器 |
| samba | 在线安装 | SAMBA服务器 |
| syncthing | 在线安装 | 开源分布式同步工具 |
| thermometer | 在线安装 | CPU、WLAN温度监控工具 |
| vlmcsd | 1113 | 给予巨硬套装活力 |
| webdav | 在线安装 | webdav服务器 |
| wol | | 定时开机 |
| xray | 在线安装 | xray网络代理 |

## 版本18.11(2023-01-25)

#### 新增
Expand Down
2 changes: 1 addition & 1 deletion script_bootloader/bin/addons_install
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ then
# 禁用MONIT MANAGEMENT SYSTEM及其全部服务
if [ "$(which monit)" == "/opt/bin/monit" ]
then
for MONIT_SERVICE in $(/opt/bin/monit -B summary | /opt/bin/sed -E -n -e '1,2d' -e 's/^[[:space:]]*([^[:space:]]+)[[:space:]]+.*/\1/p')
for MONIT_SERVICE in $(/opt/bin/monit -vB summary | /opt/bin/grep -E '[[:space:]]+Name[[:space:]]+=[[:space:]]+' | /opt/bin/sed -E -n -e 's#([^=]+=[[:space:]]+)([^[:space:]]+$)#\2#p')
do
/opt/bin/monit stop "${MONIT_SERVICE}"
#
Expand Down
2 changes: 1 addition & 1 deletion script_bootloader/bin/script_bootloader_usb_umount
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if [ "$(which monit)" == "/opt/bin/monit" ]
then
monit stop all
#
for MONIT_SERVICE in $(monit -B summary | sed -E -n -e '1,2d' -e 's/^[[:space:]]*([^[:space:]]+)[[:space:]]+.*/\1/p')
for MONIT_SERVICE in $(monit -vB summary | grep -E '[[:space:]]+Name[[:space:]]+=[[:space:]]+' | sed -E -n -e 's#([^=]+=[[:space:]]+)([^[:space:]]+$)#\2#p')
do
while [ "$(monit -B status "${MONIT_SERVICE}" | sed -E -n -e 's/^[[:space:]]*status[[:space:]]+(.*)/\1/p')" != "Not monitored" ]
do
Expand Down
3 changes: 3 additions & 0 deletions script_bootloader/usr/dependency/etc/aarch64_list_of_packages
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ boost-test
boost-thread
boost-timer
boost-type_erasure
boost-url
boost-wave
boost-wserialization
perl
Expand Down Expand Up @@ -311,6 +312,7 @@ python3-email
python3-et_xmlfile
python3-hyperlink
python3-idna
python3-ifaddr
python3-incremental
python3-jdcal
python3-lib2to3
Expand All @@ -324,6 +326,7 @@ python3-markupsafe
python3-msgpack
python3-multiprocessing
python3-ncurses
python3-newt
python3-openpyxl
python3-openssl
python3-packaging
Expand Down
3 changes: 3 additions & 0 deletions script_bootloader/usr/dependency/etc/armv7l_list_of_packages
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ boost-test
boost-thread
boost-timer
boost-type_erasure
boost-url
boost-wave
boost-wserialization
perl
Expand Down Expand Up @@ -311,6 +312,7 @@ python3-email
python3-et_xmlfile
python3-hyperlink
python3-idna
python3-ifaddr
python3-incremental
python3-jdcal
python3-lib2to3
Expand All @@ -324,6 +326,7 @@ python3-markupsafe
python3-msgpack
python3-multiprocessing
python3-ncurses
python3-newt
python3-openpyxl
python3-openssl
python3-packaging
Expand Down
2 changes: 1 addition & 1 deletion script_bootloader/usr/dnsmasq.d/bin/dnsmasq.d_install
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ then
/opt/bin/echo "bogus-priv" >> "${ENTWARE_DNSMASQD}/dnsmasq_extended.conf"
fi
#
if [ -z "$(/opt/bin/grep -e '^local=\/'"${LOCAL_DOMAIN}"'\/' "${FMW_DNSMASQ_CONF}")" ]
if [ -z "$(/opt/bin/grep -e '^local=/'"${LOCAL_DOMAIN}"'/' "${FMW_DNSMASQ_CONF}")" ]
then
/opt/bin/echo "local=/${LOCAL_DOMAIN}/" >> "${ENTWARE_DNSMASQD}/dnsmasq_extended.conf"
fi
Expand Down
12 changes: 6 additions & 6 deletions script_bootloader/usr/entware/bin/entware_install
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ fi
# 根据路由器架构,自动安装适当版本的Entware
case "$(uname -m)" in
"aarch64")
if [ -e "${PRIVATE_USR}/entware_repo_aarch64-k3.10.tar.gz" ]
if [ -e "${PRIVATE_USR}"/*entware_repo_aarch64-k3.10.tar.gz ]
then
echo -e "($(basename $0)): $$ \033[1;44;37mINFO\033[0m: OFFLINE PACKAGE HAS BEEN FOUND"
#
tar -xzvf "${PRIVATE_USR}/entware_repo_aarch64-k3.10.tar.gz" -C "${PRIVATE_USR}" > /dev/null 2>&1
tar -xzvf "${PRIVATE_USR}"/*entware_repo_aarch64-k3.10.tar.gz -C "${PRIVATE_USR}" > /dev/null 2>&1
#
if [ ${?} -ne 0 ]
then
Expand Down Expand Up @@ -165,11 +165,11 @@ case "$(uname -m)" in
fi
;;
"armv7l")
if [ -e "${PRIVATE_USR}/entware_repo_armv7sf-k2.6.tar.gz" ]
if [ -e "${PRIVATE_USR}"/*entware_repo_armv7sf-k2.6.tar.gz ]
then
echo -e "($(basename $0)): $$ \033[1;44;37mINFO\033[0m: OFFLINE PACKAGE HAS BEEN FOUND"
#
tar -xzvf "${PRIVATE_USR}/entware_repo_armv7sf-k2.6.tar.gz" -C "${PRIVATE_USR}" > /dev/null 2>&1
tar -xzvf "${PRIVATE_USR}"/*entware_repo_armv7sf-k2.6.tar.gz -C "${PRIVATE_USR}" > /dev/null 2>&1
#
if [ ${?} -ne 0 ]
then
Expand Down Expand Up @@ -201,11 +201,11 @@ case "$(uname -m)" in
fi
;;
"mips")
if [ -e "${PRIVATE_USR}/entware_repo_mipsel.tar.gz" ]
if [ -e "${PRIVATE_USR}"/*entware_repo_mipsel.tar.gz ]
then
echo -e "($(basename $0)): $$ \033[1;44;37mINFO\033[0m: OFFLINE PACKAGE HAS BEEN FOUND"
#
tar -xzvf "${PRIVATE_USR}/entware_repo_mipsel.tar.gz" -C "${PRIVATE_USR}" > /dev/null 2>&1
tar -xzvf "${PRIVATE_USR}"/*entware_repo_mipsel.tar.gz -C "${PRIVATE_USR}" > /dev/null 2>&1
#
if [ ${?} -ne 0 ]
then
Expand Down
2 changes: 1 addition & 1 deletion script_bootloader/usr/filebrowser/README_zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@
>
> Web页面登陆地址:http://<路由器IP地址>:35248
>
> 工作目录`/root/`
> 默认工作目录`/home`
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion script_bootloader/usr/filebrowser/alternative/version

This file was deleted.

10 changes: 5 additions & 5 deletions script_bootloader/usr/filebrowser/bin/filebrowser_enable.service
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ FILEBROWSER_PID_FILE="/var/run/filebrowser.pid"
#
########## CHECK AND ENABLE FILE-BROWSER ##########
#
# Check if ${PRIVATE_USR}/filebrowser and ${PRIVATE_ETC}/database.db exist
# 检查文件${PRIVATE_USR}/filebrowser和${PRIVATE_ETC}/database.db是否存在
if [ -e "${PRIVATE_USR}/filebrowser" ] && [ -e "${PRIVATE_ETC}/database.db" ]
# Check if ${PRIVATE_USR}/filebrowser and ${PRIVATE_ETC}/filebrowser.db exist
# 检查文件${PRIVATE_USR}/filebrowser和${PRIVATE_ETC}/filebrowser.db是否存在
if [ -e "${PRIVATE_USR}/filebrowser" ] && [ -e "${PRIVATE_ETC}/filebrowser.db" ]
then
/opt/bin/echo -e "($(basename $0)): $$ \033[1;44;37mINFO\033[0m: ALL THE PREREQUISITES ARE MET"
#
# Load ${PRIVATE_USR}/filebrowser
# 如果文件${PRIVATE_USR}/filebrowser和${PRIVATE_ETC}/database.db存在,则执行
/opt/bin/nohup "${PRIVATE_USR}/filebrowser" --database "${PRIVATE_ETC}/database.db" &> /dev/null &
# 如果文件${PRIVATE_USR}/filebrowser和${PRIVATE_ETC}/filebrowser.db存在,则执行
/opt/bin/nohup "${PRIVATE_USR}/filebrowser" --database "${PRIVATE_ETC}/filebrowser.db" &> /dev/null &
/opt/bin/sleep 10
PID="$(pidof filebrowser)"
/opt/bin/echo "${PID}" > "${FILEBROWSER_PID_FILE}"
Expand Down
4 changes: 2 additions & 2 deletions script_bootloader/usr/filebrowser/bin/filebrowser_install
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ then
#
# Configure filebrowser
# 配置filebrowser
"${PRIVATE_USR}/filebrowser" --database "${PRIVATE_ETC}/database.db" config init --address "0.0.0.0" --branding.disableExternal --locale "${LANGUAGE}" --perm.admin --port "35248" --scope "/root" --sorting.by "name" --viewMode "list"
"${PRIVATE_USR}/filebrowser" --database "${PRIVATE_ETC}/filebrowser.db" config init --address "0.0.0.0" --auth.method "json" --branding.disableExternal --locale "${LANGUAGE}" --port "35248" --root "/home" --sorting.by "name" --viewMode "list"
#
"${PRIVATE_USR}/filebrowser" --database "${PRIVATE_ETC}/database.db" users add "${ADMINUSER}" "${ADMINPASSWORD}"
"${PRIVATE_USR}/filebrowser" --database "${PRIVATE_ETC}/filebrowser.db" users add "${ADMINUSER}" "${ADMINPASSWORD}" --perm.admin --scope "/root"
#
# Configure fwd
# 配置fwd
Expand Down
64 changes: 47 additions & 17 deletions script_bootloader/usr/he_ddns/bin/he_ddns_enable.service
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ PRIVATE_VAR="${PRIVATE_ROOT}/var"
#
# LOGFILE: The log file
# 设置自定义变量LOGFILE为日志文件
LOGFILE="${PRIVATE_VAR}/log.txt"
LOGFILE="${PRIVATE_VAR}/log.tsv"
#
if [ ! -f "${LOGFILE}" ]
then
/opt/bin/rm -rf "${LOGFILE}"
/opt/bin/echo -e "DATE\tTIME\tSTATUS\tDETAILS\tNOTES" > "${LOGFILE}"
fi
#
# WAN0_GW_IFNAME: The interface name of WAN0 gateway
# 设置自定义变量WAN0_GW_IFNAME为WAN0网关设备名
Expand Down Expand Up @@ -117,9 +123,9 @@ FAIL_COUNT=0
# 测试WAN连接
while [ ${FAIL_COUNT} -lt 3 ]
do
RESULT_1_OF_CONNECTION_TEST="$(ping -q -c 1 -s 32 -W 5 "www.bing.com" 2> /dev/null | grep "100%")"
RESULT_2_OF_CONNECTION_TEST="$(ping -q -c 1 -s 32 -W 5 "www.alibaba.com" 2> /dev/null | grep "100%")"
RESULT_3_OF_CONNECTION_TEST="$(ping -q -c 1 -s 32 -W 5 "www.baidu.com" 2> /dev/null | grep "100%")"
RESULT_1_OF_CONNECTION_TEST="$(ping -q -c 1 -s 32 -W 5 "www.bing.com" 2> /dev/null | /opt/bin/grep "100%")"
RESULT_2_OF_CONNECTION_TEST="$(ping -q -c 1 -s 32 -W 5 "www.alibaba.com" 2> /dev/null | /opt/bin/grep "100%")"
RESULT_3_OF_CONNECTION_TEST="$(ping -q -c 1 -s 32 -W 5 "www.baidu.com" 2> /dev/null | /opt/bin/grep "100%")"
#
if [ -z "${RESULT_1_OF_CONNECTION_TEST}"] || [ -z "${RESULT_2_OF_CONNECTION_TEST}"] || [ -z "${RESULT_3_OF_CONNECTION_TEST}"]
then
Expand All @@ -142,7 +148,10 @@ do
#
if [ ${FAIL_COUNT} -ge 3 ]
then
/opt/bin/echo -e "FAILURE: [${FAIL_DATE}] CAN NOT GET IP ADDRESS" | /opt/bin/tee -a "${LOGFILE}"
/opt/bin/echo -e "FAILURE: [${FAIL_DATE}] CAN NOT GET IP ADDRESS"
#
FAIL_DATE_FMT="$(/opt/bin/echo -e "${FAIL_DATE}" | /opt/bin/sed -E -n -e 's/[[:space:]]+/\t/p')"
/opt/bin/echo -e "${FAIL_DATE_FMT}\tFAILURE\tCAN NOT GET IP ADDRESS" >> "${LOGFILE}"
#
exit 2
fi
Expand All @@ -160,7 +169,10 @@ do
#
if [ ${FAIL_COUNT} -ge 3 ]
then
/opt/bin/echo -e "FAILURE: [${FAIL_DATE}] NO CONNECTION" | /opt/bin/tee -a "${LOGFILE}"
/opt/bin/echo -e "FAILURE: [${FAIL_DATE}] NO CONNECTION"
#
FAIL_DATE_FMT="$(/opt/bin/echo -e "${FAIL_DATE}" | /opt/bin/sed -E -n -e 's/[[:space:]]+/\t/p')"
/opt/bin/echo -e "${FAIL_DATE_FMT}\tFAILURE\tNO CONNECTION" >> "${LOGFILE}"
#
exit 1
fi
Expand All @@ -183,34 +195,49 @@ do
#
# GET IPv4
# GET方法更新IPv4
RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update?hostname=${FQDN}&password=${DDNS_PASSWORD}&myip=${EXTERNAL_IPV4_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]+.*/\1/p')"
RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update?hostname=${FQDN}&password=${DDNS_PASSWORD}&myip=${EXTERNAL_IPV4_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]*.*/\1/p')"
#
# GET IPv6
# GET方法更新IPv6
#RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update?hostname=${FQDN}&password=${DDNS_PASSWORD}&myip=${EXTERNAL_IPV6_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]+.*/\1/p')"
#RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update?hostname=${FQDN}&password=${DDNS_PASSWORD}&myip=${EXTERNAL_IPV6_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]*.*/\1/p')"
#
# POST IPv4
# POST方法更新IPv4
#RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update" -d "hostname=${FQDN}" -d "password=${DDNS_PASSWORD}" -d "myip=${EXTERNAL_IPV4_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]+.*/\1/p')"
#RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update" -d "hostname=${FQDN}" -d "password=${DDNS_PASSWORD}" -d "myip=${EXTERNAL_IPV4_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]*.*/\1/p')"
#
# POST IPv6
# POST方法更新IPv6
#RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update" -d "hostname=${FQDN}" -d "password=${DDNS_PASSWORD}" -d "myip=${EXTERNAL_IPV6_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]+.*/\1/p')"
#RESULT_OF_DDNS_UPDATE="$(/opt/bin/curl -s -k "https://dyn.dns.he.net/nic/update" -d "hostname=${FQDN}" -d "password=${DDNS_PASSWORD}" -d "myip=${EXTERNAL_IPV6_ADDRESS}" | /opt/bin/sed -E -n -e 's/([[:alpha:]]+)[[:space:]]*.*/\1/p')"
#
case "${RESULT_OF_DDNS_UPDATE}" in
"good")
/opt/bin/echo -e "SUCCESS: [$(/opt/bin/date "+%F %T")] ${FQDN} 👉 ${EXTERNAL_IPV4_ADDRESS}" | /opt/bin/tee -a "${LOGFILE}"
/opt/bin/echo -e "SUCCESS: [$(/opt/bin/date "+%F %T")] ${FQDN} 👉 ${EXTERNAL_IPV4_ADDRESS}"
#
/opt/bin/echo -e "$(/opt/bin/date "+%F%t%T")\tSUCCESS\t${FQDN} 👉 ${EXTERNAL_IPV4_ADDRESS}" >> "${LOGFILE}"
#
exit 0
;;
"nochg")
/opt/bin/echo -e "NO-CHANGES: ${FQDN} 👉 ${EXTERNAL_IPV4_ADDRESS}"
#
exit 0
;;
"badauth")
/opt/bin/echo -e "FAILURE: [$(/opt/bin/date "+%F %T")] BAD AUTHENTICATION"
#
/opt/bin/echo -e "$(/opt/bin/date "+%F%t%T")\tFAILURE\tBAD AUTHENTICATION" >> "${LOGFILE}"
#
exit 4
;;
*)
/opt/bin/echo -e "FAILURE: [$(/opt/bin/date "+%F %T")] UNKNOWN ERROR"
#
/opt/bin/echo -e "$(/opt/bin/date "+%F%t%T")\tFAILURE\tUNKNOWN ERROR" >> "${LOGFILE}"
#
exit 5
;;
esac
#
FAIL_DATE=""
FAIL_COUNT=0
#
exit 0
#
else
if [ -z "${FAIL_DATE}" ]
then
Expand All @@ -223,7 +250,10 @@ do
then
# Send an email as notification
# 如果${WAN0_GW_IPV4_ADDRESS}与${EXTERNAL_IPV4_ADDRESS}不等,则执行
/opt/bin/echo -e "FAILURE: [${FAIL_DATE}] EXTERNAL_IP(${EXTERNAL_IPV4_ADDRESS}) WAN0_GW_IP(${WAN0_GW_IPV4_ADDRESS})" | /opt/bin/tee -a "${LOGFILE}"
/opt/bin/echo -e "FAILURE: [${FAIL_DATE}] EXTERNAL_IP(${EXTERNAL_IPV4_ADDRESS}) WAN0_GW_IP(${WAN0_GW_IPV4_ADDRESS})"
#
FAIL_DATE_FMT="$(/opt/bin/echo -e "${FAIL_DATE}" | /opt/bin/sed -E -n -e 's/[[:space:]]+/\t/p')"
/opt/bin/echo -e "${FAIL_DATE_FMT}\tFAILURE\tEXTERNAL_IP(${EXTERNAL_IPV4_ADDRESS}) WAN0_GW_IP(${WAN0_GW_IPV4_ADDRESS})" >> "${LOGFILE}"
#
# Prepare mail contents
# 准备邮件内容
Expand Down
2 changes: 1 addition & 1 deletion script_bootloader/usr/samba/etc/smb.conf.add.template
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

[ROUTER_MODEL-SMB-SHARE]
comment = Samba Share on ROUTER_MODEL
path = /home/root
path = /home
writable = yes
browseable = yes
#
Expand Down
Loading

0 comments on commit 310fbcb

Please sign in to comment.