kiddin9 il y a 4 ans
Parent
commit
c73ea94819

+ 2 - 0
.github/workflows/Openwrt-AutoBuild.yml

@@ -220,6 +220,7 @@ jobs:
         Emoji=("🎉" "🤞" "✨" "🎁" "🎈" "🎄" "🎨" "💋" "🍓" "🍕" "🍉" "💐" "🌴" "🚀" "🛸" "🗽" "⛅" "🌈" "🔥" "⛄" "🐶" "🏅" "🦄" "🐤")
         echo "EMOJI=${Emoji[$[$RANDOM % ${#Emoji[@]}]]}" >> $GITHUB_ENV
         if [ ${{matrix.target}} == "x86_64" ]; then
+        echo "DOCKERTAG=${{ secrets.DOCKER_ID }}/openwrt-nginx:latest" >> $GITHUB_ENV
         echo "NOTICE=请分配不少于1G的存储容量" >> $GITHUB_ENV
         fi
 
@@ -307,6 +308,7 @@ jobs:
         push: true
         tags: |
           ${{ secrets.DOCKER_ID }}/openwrt-nginx:${{ matrix.target }}
+          ${{ env.DOCKERTAG }}
     
     - name: WeChat notification
       continue-on-error: true

+ 3 - 0
devices/common/.config

@@ -202,6 +202,9 @@ CONFIG_PACKAGE_kmod-ebtables=y
 CONFIG_PACKAGE_kmod-ebtables-ipv4=y
 CONFIG_PACKAGE_kmod-ebtables-ipv6=y
 
+# rclone
+CONFIG_PACKAGE_kmod-fuse=y
+
 # Mobile USB Ethernet driver
 CONFIG_PACKAGE_kmod-usb-net-rndis=y
 CONFIG_PACKAGE_kmod-usb-net-ipheth=y

+ 1 - 1
devices/common/default-settings

@@ -30,7 +30,7 @@ sed -i "s/git-.*-\(.*\)/git-\1/g" /usr/lib/lua/luci/version.lua
 ln -s /sbin/poweroff /sbin/shutdown
 
 sed -i '/S99opkg/d' /etc/crontabs/root
-sec="$(grep -m1 -ao '[0-6][0-9]' /dev/urandom | head -n1)"
+sec="$(grep -m1 -ao '[0-5][0-9]' /dev/urandom | head -n1)"
 echo "$sec 4 * * * sh /etc/rc.d/S99opkg >/dev/null 2>&1" >> /etc/crontabs/root
 
 [[ "$(echo "$(/sbin/cpuinfo 2>/dev/null)" | grep -i "MHz")" ]] || sed -i "s/_('CPU Info'),cpuinfo.cpufreq,//" /www/luci-static/resources/view/status/include/10_system.js

+ 2 - 3
devices/common/patches/nginx_luci.patch

@@ -1,10 +1,11 @@
 --- a/package/feeds/packages/nginx/files-luci-support/luci.locations
 +++ b/package/feeds/packages/nginx/files-luci-support/luci.locations
-@@ -1,12 +1,13 @@
+@@ -1,11 +1,12 @@
 -location /cgi-bin/luci {
 +location /luci {
  		index  index.html;
  		include uwsgi_params;
++		uwsgi_read_timeout 300s;
  		uwsgi_param SERVER_ADDR $server_addr;
  		uwsgi_modifier1 9;
  		uwsgi_pass unix:////var/run/luci-webui.socket;
@@ -12,10 +13,8 @@
 -location ~ /cgi-bin/cgi-(backup|download|upload|exec) {
 +location ~ /cgi-(backup|download|upload|exec|bin) {
  		include uwsgi_params;
-+		uwsgi_read_timeout 300s;
  		uwsgi_param SERVER_ADDR $server_addr;
  		uwsgi_modifier1 9;
- 		uwsgi_pass unix:////var/run/luci-cgi_io.socket;
 
 --- a/package/network/services/dnsmasq/files/dnsmasq.init
 +++ b/package/network/services/dnsmasq/files/dnsmasq.init