Skip to content

Commit 52f3f0a

Browse files
sorasorassorasoras
authored
Merge pull request #5 from garypang13/master
1
2 parents 3b7ff7e + 1917caf commit 52f3f0a

File tree

23 files changed

+462
-92
lines changed

23 files changed

+462
-92
lines changed

‎.github/workflows/build-openwrt.yml

+25-10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ env:
1919
PPPOE_USERNAME: ${{ secrets.PPPOE_USERNAME }}
2020
PPPOE_PASSWD: ${{ secrets.PPPOE_PASSWD }}
2121
SCKEY: ${{ secrets.SCKEY }}
22+
TELEGRAM_TOKEN : ${{ secrets.TELEGRAM_TOKEN }}
23+
TELEGRAM_TO : ${{ secrets.TELEGRAM_TO }}
2224
TZ: Asia/Shanghai
2325

2426
jobs:
@@ -30,7 +32,7 @@ jobs:
3032
uses: actions/checkout@master
3133

3234
- name: Load Settings.ini
33-
run: |
35+
run: |
3436
source "${GITHUB_WORKSPACE}/settings.ini"
3537
echo "::set-env name=REPO_URL::${REPO_URL}"
3638
echo "::set-env name=REPO_BRANCH::${REPO_BRANCH}"
@@ -80,15 +82,18 @@ jobs:
8082
ln -s /mnt/openwrt/staging_dir openwrt/staging_dir
8183
8284
- name: Update feeds
83-
run: cd openwrt && ./scripts/feeds update -a
85+
run: cd openwrt && ./scripts/feeds update custom -a
8486

8587
- name: Load custom configuration
8688
run: |
8789
cp -Rf * openwrt/ || true
8890
cd openwrt
8991
chmod +x $DIY_SH
90-
./$DIY_SH
92+
./$DIY_SH >/dev/null
9193
[ -e $CONFIG_FILE ] && mv $CONFIG_FILE .config
94+
[ ${{ github.event.repository.owner.id }} != '48883331' ] && {
95+
sed -i "s/=m/=n/g" .config
96+
}
9297
make defconfig
9398
[ $(grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/') == generic ] && DEVICE_NAME=$(grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/CONFIG_TARGET_(.*)_DEVICE_.*=y/\1/') || DEVICE_NAME=$(grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/')
9499
echo "::set-env name=DEVICE_NAME::$DEVICE_NAME"
@@ -101,7 +106,7 @@ jobs:
101106
sed -i '$i uci commit network' openwrt/package/*/*/default-settings/files/zzz-default-settings
102107
103108
- name: SSH connection to Actions
104-
uses: P3TERX/debugger-action@master
109+
uses: garypang13/debugger-action@master
105110
if: env.SSH_ACTIONS == 'true'
106111

107112
- name: Download package
@@ -134,6 +139,7 @@ jobs:
134139
-or -name "sha256sums" \
135140
-or -name "*adbyby*" \
136141
-or -name "*passwall*" \
142+
-or -name "*kodexplorer*" \
137143
-or -name "*chinadns*" \
138144
-or -name "*cifs-mount*" \
139145
-or -name "*music-remote-center*" -or -name "*forked-daapd*" \
@@ -151,6 +157,7 @@ jobs:
151157
cd firmware
152158
rename -v "s/^openwrt/${{ env.date3 }}-openwrt/" *combined*
153159
zip -r luci-app-adbyby-plus.zip *adbyby* || true
160+
zip -r luci-app-php-kodexplorer *kodexplorer* || true
154161
zip -r luci-app-passwall.zip *passwall* *chinadns* *haproxy* || true
155162
zip -r luci-app-baidupcs-web.zip *baidupcs* || true
156163
zip -r luci-app-cifs-mount.zip *cifs-mount* || true
@@ -179,25 +186,28 @@ jobs:
179186
cowurl=$(./transfer cow --block 2621440 -s --no-progress ${FIRMWARE})
180187
cowurl=$(echo $cowurl | grep -o -E "https[^ ]*")
181188
echo "::set-env name=COWURL::$cowurl"
182-
echo "Download Link: ${{ env.EMOJI }} $cowurl ${{ env.EMOJI }}"
189+
echo "Download Link: ${{ env.EMOJI }} $cowurl ${{ env.EMOJI }} 🚀"
183190
184191
- name: Create release
185192
id: create_release
186193
uses: actions/create-release@master
187-
if: env.UPLOAD_FIRMWARE_FOR_RELEASE == 'true'
194+
continue-on-error: true
195+
if: env.REPO_TOKEN && env.UPLOAD_FIRMWARE_FOR_RELEASE == 'true'
188196
env:
189197
GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
190198
with:
191199
tag_name: ${{ env.date }}_${{ env.DEVICE_NAME }}
192200
release_name: ${{ env.date2 }} ${{ env.DEVICE_NAME }} ${{ env.EMOJI }}
193201
body: |
194-
国内加速下载:
195-
${{ env.COWURL }} ${{ env.EMOJI }}
202+
墙内加速下载🔥:
203+
${{ env.COWURL }} 🚀
204+
请分配不低于1G 的内存和存储空间💾.
196205
draft: false
197206
prerelease: false
198207

199208
- name: Upload firmware for release
200209
uses: csexton/release-asset-action@master
210+
continue-on-error: true
201211
if: env.REPO_TOKEN && env.UPLOAD_FIRMWARE_FOR_RELEASE == 'true'
202212
with:
203213
pattern: "${{ env.FIRMWARE }}/*"
@@ -209,10 +219,15 @@ jobs:
209219
continue-on-error: true
210220
if: env.UPLOAD_FIRMWARE_FOR_ARTIFACT == 'true'
211221
with:
212-
name: ${{ env.date3 }} ${{ env.DEVICE_NAME }} ${{ env.EMOJI }}
222+
name: ${{ env.date3 }} ${{ env.DEVICE_NAME }}
213223
path: ${{ env.FIRMWARE }}
214224

215225
- name: WeChat notification
216226
if: env.SCKEY && !cancelled()
217227
run: |
218-
[ ${{ env.status }} == 'success' ] && curl https://sc.ftqq.com/${{ secrets.SCKEY }}.send?text=OpenWrt_${{ env.date3 }}_${{ env.DEVICE_NAME }}编译完成 || curl https://sc.ftqq.com/${{ secrets.SCKEY }}.send?text=OpenWrt_${{ env.date3 }}_${{ env.DEVICE_NAME }}编译失败
228+
[ ${{ env.status }} == 'success' ] && curl https://sc.ftqq.com/${{ secrets.SCKEY }}.send?text=🎉OpenWrt_${{ env.date3 }}_${{ env.DEVICE_NAME }}编译完成😋 || curl https://sc.ftqq.com/${{ secrets.SCKEY }}.send?text=❌OpenWrt_${{ env.date3 }}_${{ env.DEVICE_NAME }}编译失败😂
229+
230+
- name: Telegram notification
231+
if: env.TELEGRAM_TOKEN && !cancelled()
232+
run: |
233+
[ ${{ env.status }} == 'success' ] && curl -k --data chat_id="${{ secrets.TELEGRAM_TO }}" --data "text=🎉 OpenWrt ${{ env.date3 }} ${{ env.DEVICE_NAME }} 编译成功 😋" "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" || curl -k --data chat_id="${{ secrets.TELEGRAM_TO }}" --data "text=❌ OpenWrt ${{ env.date3 }} ${{ env.DEVICE_NAME }} 编译失败 😂" "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage"

‎README.md

+19-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
+ 性能,友好度,易用性,插件,以及针对国内特殊环境等的自定义优化
88

99
+ uhttpd替换为nginx,大大增加可玩性:
10-
+ nginx搭配PHP与可道云,建站,NAS两不误,基本可替换群晖等专业NAS系统
10+
+ Nginx+PHP+MariaDB, 用于搭建FileRun,可道云等云盘,建站等.
1111
+ 通过nginx实现Webdav 自建共享同步网盘神器
1212
+ nginx反向代理 实现后台每个页面与服务都可通过自定义域名访问
1313

@@ -37,7 +37,9 @@ X86_64固件在此 [Releases](https://github.com/garypang13/Actions-OpenWrt-Ngin
3737

3838
在仓库Settings->Secrets中分别添加 PPPOE_USERNAME, PPPOE_PASSWD 可设置默认拨号账号密码.
3939

40-
在仓库Settings->Secrets中添加 SCKEY 可通过[Server酱](http://sc.ftqq.com)推送编译结果到微信
40+
Secrets中添加 SCKEY 可通过[Server酱](http://sc.ftqq.com)推送编译结果到微信
41+
42+
Secrets中添加 TELEGRAM_TO (chat_id), TELEGRAM_TOKEN (token) 可推送编译结果到Telegram Bot. [教程](https://longnight.github.io/2018/12/12/Telegram-Bot-notifications)
4143

4244
点击右上角的Star按钮开始编译
4345

@@ -47,6 +49,7 @@ diy云编译教程: [Read the details in my blog (in Chinese) | 中文教程](ht
4749

4850
+ SSR Plus
4951
+ AdguardHome DNS+恶意网址过滤
52+
+ FileRun google drive风格多功能网盘
5053
+ 上网时间控制
5154
+ 微信推送
5255
+ ACME自动SSL证书生成
@@ -59,32 +62,34 @@ diy云编译教程: [Read the details in my blog (in Chinese) | 中文教程](ht
5962
+ ttyd 网页版终端
6063
+ UPNP 自动端口转发
6164
+ Aria2 全能下载工具
62-
+ BaiduPCS-Web 百度网盘web客户端(修复登录)
65+
+ BaiduPCS-Web 百度网盘web客户端(Aria2+修复登录)
6366
+ cifsd + NFS 网络共享
6467
+ Netdata 全能性能监控
6568
+ diskman 磁盘管理
6669
+ dockerman 玩转docker必备
6770
+ Rclone 网盘挂载,同步工具
6871
+ qBittorrent BT下载工具
6972
+ Transmission BT/PT下載工具
70-
+ 可道云 做NAS必备
71-
+ PHP 建站与可道云必备
7273
+ aMule 电骡下载 ed2k必备
7374
+ Turbo ACC 网络加速
7475
+ SQM QOS 智能网络优化
7576
+ eqos IP限速
77+
+ Mwan3 负载均衡
7678
+ AppFilter App过滤
7779
+ nlbwmon 宽带监控
7880

7981
其他插件请在[Releases](https://github.com/garypang13/Actions-OpenWrt-Nginx/releases/latest)中下载对应的ipk文件,自行安装.
8082

83+
#### 默认后台地址 10.0.0.1, 密码 root
84+
85+
#### 请分配不低于1G 的内存和磁盘空间.
86+
8187
### 如何在本地使用此项目编译自己需要的 OpenWrt 固件
8288

8389
#### 注意：
8490

8591
1. **不**要用 **root** 用户 git 和编译！！！
8692
2. 国内用户编译前请准备好梯子,使用大陆白名单或全局模式
87-
3. 默认登陆10.0.0.1, 密码 root
8893

8994
#### 编译命令如下:
9095

@@ -102,7 +107,7 @@ git clone https://github.com/garypang13/Actions-OpenWrt-Nginx
102107
cp -Rf Actions-OpenWrt-Nginx/* openwrt/
103108
cd openwrt
104109
./scripts/feeds update -a
105-
./diy.sh
110+
sh ./diy.sh
106111
mv X86_64.config .config
107112
make defconfig
108113
```
@@ -111,10 +116,13 @@ make defconfig
111116
rm -Rf Actions-OpenWrt-Nginx && git clone https://github.com/garypang13/Actions-OpenWrt-Nginx
112117
cp -Rf Actions-OpenWrt-Nginx/* openwrt/
113118
cd openwrt
114-
git pull
115-
rm -Rf feeds
116-
./scripts/feeds update -a
117-
./diy.sh
119+
rm -Rf feeds package tmp
120+
svn co https://github.com/openwrt/openwrt/trunk/package
121+
git pull
122+
[ -f ".config" ] && mv .config .config.bak
123+
./scripts/feeds update custom -a
124+
sh ./diy.sh
125+
[ -f ".config.bak" ] && mv .config.bak .config || mv X86_64.config .config
118126
make defconfig
119127
```
120128
5. 如需修改默认配置比如定制插件等,请执行 `make menuconfig`

‎X86_64.config

+28-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 设置固件大小:
22
CONFIG_TARGET_KERNEL_PARTSIZE=30
3-
CONFIG_TARGET_ROOTFS_PARTSIZE=500
3+
CONFIG_TARGET_ROOTFS_PARTSIZE=960
44

55
CONFIG_TARGET_x86=y
66
CONFIG_TARGET_x86_64=y
@@ -9,6 +9,7 @@ CONFIG_SIGNATURE_CHECK=n
99
CONFIG_TARGET_ROOTFS_EXT4FS=n
1010
CONFIG_LUCI_CSSTIDY=n
1111
CONFIG_GRUB_CONSOLE=n
12+
CONFIG_BUILD_PATENTED=y
1213

1314
# EFI支持:
1415
CONFIG_GRUB_IMAGES=y
@@ -67,6 +68,7 @@ CONFIG_PACKAGE_luci-app-dynapoint=n
6768
CONFIG_PACKAGE_luci-app-e2guardian=n
6869
CONFIG_PACKAGE_luci-app-eqos=y
6970
CONFIG_PACKAGE_luci-app-familycloud=n
71+
CONFIG_PACKAGE_luci-app-filerun=y
7072
CONFIG_PACKAGE_luci-app-filetransfer=y
7173
CONFIG_PACKAGE_luci-app-firewall=y
7274
CONFIG_PACKAGE_luci-app-flowoffload=y
@@ -85,7 +87,7 @@ CONFIG_PACKAGE_luci-app-minidlna=n
8587
CONFIG_PACKAGE_luci-app-mjpg-streamer=n
8688
CONFIG_PACKAGE_luci-app-mtwifi=n
8789
CONFIG_PACKAGE_luci-app-music-remote-center=m
88-
CONFIG_PACKAGE_luci-app-mwan3=n
90+
CONFIG_PACKAGE_luci-app-mwan3=y
8991
CONFIG_PACKAGE_luci-app-mwan3helper=n
9092
CONFIG_PACKAGE_luci-app-n2n_v2=n
9193
CONFIG_PACKAGE_luci-app-netdata=y
@@ -111,7 +113,7 @@ CONFIG_PACKAGE_luci-app-pagekitec=n
111113

112114
CONFIG_PACKAGE_luci-app-passwall=m
113115

114-
CONFIG_PACKAGE_luci-app-php-kodexplorer=y
116+
CONFIG_PACKAGE_luci-app-php-kodexplorer=m
115117
CONFIG_PACKAGE_luci-app-polipo=n
116118
CONFIG_PACKAGE_luci-app-pppoe-relay=n
117119
CONFIG_PACKAGE_luci-app-privoxy=n
@@ -172,7 +174,7 @@ CONFIG_PACKAGE_luci-app-webadmin=n
172174
CONFIG_PACKAGE_luci-app-wifischedule=n
173175
CONFIG_PACKAGE_luci-app-wireguard=n
174176
CONFIG_PACKAGE_luci-app-wol=n
175-
CONFIG_PACKAGE_luci-app-wrtbwmon=y
177+
CONFIG_PACKAGE_luci-app-wrtbwmon=n
176178
CONFIG_PACKAGE_luci-app-xlnetacc=m
177179
CONFIG_PACKAGE_luci-app-zerotier=m
178180

@@ -209,6 +211,7 @@ CONFIG_PACKAGE_fuse-utils=y
209211
CONFIG_PACKAGE_python3=y
210212
CONFIG_PACKAGE_python3-yaml=y
211213
CONFIG_PACKAGE_python3-urllib3=y
214+
CONFIG_PACKAGE_python3-pip=y
212215
CONFIG_PACKAGE_default-settings=y
213216
CONFIG_PACKAGE_iptables-mod-nat-extra=y
214217
CONFIG_PACKAGE_iptables-mod-filter=y
@@ -260,20 +263,35 @@ CONFIG_PACKAGE_kmod-usb-net-rtl8150=y
260263
CONFIG_PACKAGE_kmod-usb-net-rtl8152=y
261264
CONFIG_PACKAGE_kmod-sound-core=y
262265
CONFIG_PACKAGE_kmod-usb-audio=y
266+
CONFIG_PACKAGE_unzip=y
267+
CONFIG_PACKAGE_bash=y
263268
CONFIG_GRUB_BOOTOPTS="nomodeset"
264269
CONFIG_KERNEL_BUILD_USER="GaryPang"
265-
CONFIG_GRUB_TITLE="OpenWrt compiled by GaryPang"
266-
CONFIG_KERNEL_BUILD_DOMAIN="https://github.com/garypang13/Actions-OpenWrt-Nginx"
270+
271+
CONFIG_PACKAGE_imagemagick=n
272+
CONFIG_PACKAGE_ffmpeg=n
267273

268274
# CONFIG_PACKAGE_php7=y
269275
# CONFIG_PACKAGE_php7-fpm=y
276+
# CONFIG_PACKAGE_php7-mod-session=y
270277
# CONFIG_PACKAGE_php7-mod-curl=y
271278
# CONFIG_PACKAGE_php7-mod-gd=y
272-
# CONFIG_PACKAGE_php7-mod-iconv=y
279+
# CONFIG_PACKAGE_php7-mod-session=y
280+
# CONFIG_PACKAGE_php7-mod-ctype=y
273281
# CONFIG_PACKAGE_php7-mod-json=y
274282
# CONFIG_PACKAGE_php7-mod-mbstring=y
283+
# CONFIG_PACKAGE_php7-mod-filter=y
275284
# CONFIG_PACKAGE_php7-mod-opcache=y
276-
# CONFIG_PACKAGE_php7-mod-session=y
277-
# CONFIG_PACKAGE_php7-mod-zip=y
278-
# CONFIG_PACKAGE_php7-mod-sqlite3=y
285+
# CONFIG_PACKAGE_php7-mod-sockets=y
286+
# CONFIG_PACKAGE_php7-mod-pdo-mysql=y
287+
# CONFIG_PACKAGE_php7-mod-exif=y
288+
# CONFIG_PACKAGE_php7-mod-xml=y
279289
# CONFIG_PACKAGE_php7-mod-openssl=y
290+
# CONFIG_PACKAGE_php7-mod-fileinfo=y
291+
292+
# CONFIG_PACKAGE_mariadb-common=y
293+
# CONFIG_PACKAGE_mariadb-server-base=y
294+
# CONFIG_PACKAGE_mariadb-server=y
295+
# CONFIG_PACKAGE_mariadb-client-base=y
296+
# CONFIG_PACKAGE_mariadb-client=y
297+
# CONFIG_PACKAGE_mariadb-client-extra=y

‎default-settings

+5-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
ln -sf /sbin/ip /usr/bin/ip
4-
sed -i 's/downloads.openwrt.org\/snapshots/openwrt.proxy.ustclug.org\/releases\/19.07-SNAPSHOT/g' /etc/opkg/distfeeds.conf
4+
sed -i 's/snapshots\(.*luci\)/releases\/19.07-SNAPSHOT\1/g' /etc/opkg/distfeeds.conf
55
sed -i '/openwrt_custom/d' /etc/opkg/distfeeds.conf
66
sed -i 's/http/https/g' /etc/opkg/distfeeds.conf
77
sed -i "s/# //g" /etc/opkg/distfeeds.conf
@@ -61,7 +61,7 @@ if [ ! -f /etc/config/placeholder ]; then
6161
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='218.102.23.228'
6262
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='210.0.255.250'
6363
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='168.95.1.1'
64-
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='202.86.191.50'
64+
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='202.175.82.46'
6565
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='77.88.8.8'
6666
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='101.101.101.101'
6767
uci add_list shadowsocksr.@access_control[0].wan_fw_ips='203.198.7.66'
@@ -164,7 +164,7 @@ config server
164164
165165
config server
166166
option name '澳门'
167-
option ip '202.86.191.50'
167+
option ip '202.175.82.46'
168168
option type 'tcp'
169169
option enabled '1'
170170
@@ -175,20 +175,6 @@ config server
175175
option enabled '1'
176176
option blacklist_ip '1'
177177
178-
config server
179-
option enabled '1'
180-
option name 'geekdns'
181-
option ip 'https://i.233py.com/dns-query'
182-
option type 'https'
183-
option blacklist_ip '1'
184-
185-
config server
186-
option enabled '1'
187-
option name '中科大'
188-
option ip '202.141.162.123'
189-
option port '5353'
190-
option type 'tcp'
191-
192178
config server
193179
option enabled '1'
194180
option name '清华'
@@ -233,15 +219,15 @@ EOF
233219
fi
234220

235221
if [ -f /etc/config/jia ]; then
236-
/etc/init.d/amule disable
237222
sed -i '/=\/tmp\/dnsmasq.ssr/d' /etc/init.d/shadowsocksr
223+
sed -i 's/service_start $PROG/service_start $PROG -R/g' /etc/init.d/php7-fpm
224+
sed -i "s/user =.*/user = root/g" /etc/php7-fpm.d/www.conf
238225
fi
239226

240227
if [ ! -f /usr/bin/ssr-server ]; then
241228
sed -i '/server-config/d' /usr/lib/lua/luci/controller/shadowsocksr.lua
242229
fi
243230

244-
#/etc/init.d/amule disable
245231
find /www -type f -exec chmod 644 {} \;
246232
find /www -type d -exec chmod 755 {} \;
247233
cp -R /www/cgi-bin/* /www/
@@ -250,7 +236,6 @@ chmod +x /usr/share/aria2/*.sh
250236

251237

252238
ln -sf /usr/bin/python3 /usr/bin/python
253-
ln -sf /usr/bin/python /usr/bin/py
254239
ln -sf /usr/lib/netdata/conf.d /etc/netdata/conf.d
255240
ln /usr/lib/netdata/conf.d/charts.d.conf /etc/netdata/charts.d.conf
256241
ln /usr/lib/netdata/conf.d/python.d.conf /etc/netdata/python.d.conf

0 commit comments

Comments
 (0)