From 524fcd1396aaa859854cf8706fd5c77ea3afc92e Mon Sep 17 00:00:00 2001 From: EkkoG Date: Sun, 12 May 2024 16:48:27 +0800 Subject: [PATCH] Check modules before use, add reject-netflix-ipv6 module --- build.sh | 18 ++++++++++++++++++ .../files/etc/dnsmasq.d/netflix.conf | 11 +++++++++++ .../etc/uci-defaults/99-reject-netflix-ipv6 | 1 + .../files/etc/uci-defaults/99-ssh | 3 +++ 4 files changed, 33 insertions(+) create mode 100644 modules/reject-netflix-ipv6/files/etc/dnsmasq.d/netflix.conf create mode 100755 modules/reject-netflix-ipv6/files/etc/uci-defaults/99-reject-netflix-ipv6 create mode 100755 modules/ssh-permission/files/etc/uci-defaults/99-ssh diff --git a/build.sh b/build.sh index d88d3c2..73b76d1 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,7 @@ for module in $MODULES; do done final_modules="$(echo "$final_modules" | tr '\n' ' ')" echo "Final modules: $final_modules" + cp -r modules_in_container modules cp -r user_modules_in_container user_modules @@ -61,11 +62,28 @@ deal() { done } +echo "Checking module existence..." +for module in $final_modules; do + echo "$module" + + if [ ! -d "modules/$module" ]; then + if [ ! -d "user_modules/$module" ]; then + echo "Module $module does not exist" + exit 1 + fi + fi +done + + deal modules deal user_modules echo "All packages: $all_packages" +echo "" +ls files -R +echo "" + make info cat ./repositories.conf if [ -z "$PROFILE" ]; then diff --git a/modules/reject-netflix-ipv6/files/etc/dnsmasq.d/netflix.conf b/modules/reject-netflix-ipv6/files/etc/dnsmasq.d/netflix.conf new file mode 100644 index 0000000..4a7f3e3 --- /dev/null +++ b/modules/reject-netflix-ipv6/files/etc/dnsmasq.d/netflix.conf @@ -0,0 +1,11 @@ +# 禁止奈飞解析IPV6地址 +server=/netflix.com/# +address=/netflix.com/:: +server=/netflix.net/# +address=/netflix.net/:: +server=/nflxext.com/# +address=/nflxext.com/:: +server=/nflximg.net/# +address=/nflximg.net/:: +server=/nflxvideo.net/# +address=/nflxvideo.net/:: diff --git a/modules/reject-netflix-ipv6/files/etc/uci-defaults/99-reject-netflix-ipv6 b/modules/reject-netflix-ipv6/files/etc/uci-defaults/99-reject-netflix-ipv6 new file mode 100755 index 0000000..8a8f611 --- /dev/null +++ b/modules/reject-netflix-ipv6/files/etc/uci-defaults/99-reject-netflix-ipv6 @@ -0,0 +1 @@ +echo "conf-dir=/etc/dnsmasq.d" >> /etc/dnsmasq.conf \ No newline at end of file diff --git a/modules/ssh-permission/files/etc/uci-defaults/99-ssh b/modules/ssh-permission/files/etc/uci-defaults/99-ssh new file mode 100755 index 0000000..22fed16 --- /dev/null +++ b/modules/ssh-permission/files/etc/uci-defaults/99-ssh @@ -0,0 +1,3 @@ +if [ -f /etc/dropbear/authorized_key ]; then + chmod 644 /etc/dropbear/authorized_keys +fi \ No newline at end of file