kiddin9 4 gadi atpakaļ
vecāks
revīzija
128e01a6cd

+ 1 - 1
.github/workflows/repo-dispatcher.yml

@@ -13,7 +13,7 @@ on:
   #   branches:
   #     - master
   schedule:
-    - cron: 30 13 * * *
+    - cron: 30 18 * * *
   workflow_dispatch:
     inputs:
       skip:

+ 1 - 1
README.md

@@ -61,8 +61,8 @@
 + pve/ 可打开 Proxmox VE虚拟机管理 默认为 10.0.0.10:8006
 + by/ 可打开 Bypass插件页面 即 ip/luci/admin/services/bypass
 + pk/ 可打开 Packages插件管理页面 即 ip/luci/admin/system/opkg
++ ag/ 可打开 AriaNg 即 ip/ariang
 + ug/ 可打开 固件在线更新页面 即 ip/luci/admin/services/gpsysupgrade
-+ dl/ 可打开 固件和插件ipk仓库
 ##### 可自行在 /etc/nginx/conf.d/shortcuts.conf 中调整和添加更多快捷访问
 
 第一次使用请采用全新安装,避免出现升级失败以及其他一些可能的Bug.

+ 1 - 1
devices/common/files/etc/AdGuardHome.yaml

@@ -94,7 +94,7 @@ filters:
   id: 1628750871
 whitelist_filters: []
 user_rules:
-- '@@||edge.activity.windows.com^'
+- ""
 dhcp:
   enabled: false
   interface_name: ""

+ 7 - 0
devices/common/files/etc/nginx/conf.d/shortcuts.conf

@@ -61,3 +61,10 @@ server {
         return 301 $scheme://op/luci/admin/services/gpsysupgrade;
 	}
 
+# AriaNg
+server {
+		listen 80;
+		listen [::]:80;
+		server_name ag;
+        return 301 $scheme://op/ariang;
+	}

+ 1 - 1
devices/common/patches/opkginstall.patch

@@ -5,7 +5,7 @@
  			    inst  = packages.installed.pkgs[name];
  
 -			if (!inst || !inst.installed)
-+			if (!inst || !inst.installed || pkg.name.includes('opkg') || pkg.name.includes('luci-lib-fs') || pkg.name.includes('base-files') || pkg.name.includes('luci-base') || pkg.name.includes('busybox') || pkg.name.includes('dnsmasq-full') || pkg.name.includes('firewall') || pkg.name.includes('miniupnpd') || pkg.name.includes('coremark') || pkg.name.includes('luci-mod-network') || pkg.name.includes('luci-mod-status') || pkg.name.includes('luci-mod-system'))
++			if (!inst || !inst.installed || pkg.name.includes('opkg') || pkg.name.includes('luci-lib-fs') || pkg.name.includes('base-files') || pkg.name.includes('luci-base') || pkg.name.includes('busybox') || pkg.name.includes('nginx-') || pkg.name == "nginx" || pkg.name.includes('dnsmasq-full') || pkg.name.includes('firewall') || pkg.name.includes('miniupnpd') || pkg.name.includes('coremark') || pkg.name.includes('luci-mod-network') || pkg.name.includes('luci-mod-status') || pkg.name.includes('luci-mod-system'))
  				continue;
  
  			if (!avail || compareVersion(avail.version, pkg.version) <= 0)