From 895904d132cfc2b76b5a0c90f773e05d9866a484 Mon Sep 17 00:00:00 2001 From: klever Date: Thu, 27 Aug 2020 07:18:19 +0800 Subject: [PATCH] add adguardhome --- .github/workflows/r1s_lean.yml | 1 + .github/workflows/r1s_lean_h3.yml | 1 + .github/workflows/r2s_lean.yml | 1 + .github/workflows/r2s_lean_minimal.yml | 2 ++ app_config.seed | 2 +- scripts/autoupdate-usb.sh | 0 scripts/check_wan4 | 0 scripts/check_wan4.sh | 0 8 files changed, 6 insertions(+), 1 deletion(-) mode change 100755 => 100644 scripts/autoupdate-usb.sh mode change 100755 => 100644 scripts/check_wan4 mode change 100755 => 100644 scripts/check_wan4.sh diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index f9d3d30a6d..b58a9c8eee 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -66,6 +66,7 @@ jobs: git checkout upstream/lede-17.01 -- feeds.conf.default sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ + git clone https://github.com/rufengsuixing/luci-app-adguardhome #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git #cd luci-app-vssr/root/etc/ diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index 9bff46d2cb..a92bd4dc96 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -68,6 +68,7 @@ jobs: git checkout upstream/lede-17.01 -- feeds.conf.default sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ + git clone https://github.com/rufengsuixing/luci-app-adguardhome #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git #cd luci-app-vssr/root/etc/ diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index 1e5efbede7..0e0c9556ce 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -75,6 +75,7 @@ jobs: cd package/ && git clone https://github.com/destan19/OpenAppFilter.git && cd ../ cd package/lean/ git clone https://github.com/NateLol/luci-app-oled + git clone https://github.com/rufengsuixing/luci-app-adguardhome #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git #cd luci-app-vssr/root/etc/ diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index 953d3b098e..882ab535ec 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -124,6 +124,7 @@ jobs: # CONFIG_PACKAGE_libopenssl-devcrypto is not set # CONFIG_V2RAY_COMPRESS_UPX is not set CONFIG_PACKAGE_luci-app-oled=y + CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-flowoffload=y # CONFIG_PACKAGE_luci-app-sfe is not set CONFIG_DROPBEAR_ECC=y @@ -147,6 +148,7 @@ jobs: sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ git clone https://github.com/NateLol/luci-app-oled + git clone https://github.com/rufengsuixing/luci-app-adguardhome #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git #cd luci-app-vssr/root/etc/ diff --git a/app_config.seed b/app_config.seed index 254c5c9e55..c790748387 100644 --- a/app_config.seed +++ b/app_config.seed @@ -1,5 +1,5 @@ -CONFIG_DROPBEAR_ECC_FULL=y +CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y CONFIG_OPENSSL_ENGINE_BUILTIN=y CONFIG_OPENSSL_OPTIMIZE_SPEED=y diff --git a/scripts/autoupdate-usb.sh b/scripts/autoupdate-usb.sh old mode 100755 new mode 100644 diff --git a/scripts/check_wan4 b/scripts/check_wan4 old mode 100755 new mode 100644 diff --git a/scripts/check_wan4.sh b/scripts/check_wan4.sh old mode 100755 new mode 100644