diff --git a/liep/luci-app-control-timewol/root/etc/uci-defaults/luci-app-control-timewol b/liep/luci-app-control-timewol/root/etc/uci-defaults/luci-app-control-timewol deleted file mode 100755 index 7127b762..00000000 --- a/liep/luci-app-control-timewol/root/etc/uci-defaults/luci-app-control-timewol +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci_app_control_timewol[-1] - add ucitrack luci_app_control_timewol - set ucitrack.@luci_app_control_timewol[-1].init=luci-app-control-timewol - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-control-webrestriction/root/etc/uci-defaults/luci-app-control-webrestriction b/liep/luci-app-control-webrestriction/root/etc/uci-defaults/luci-app-control-webrestriction deleted file mode 100755 index ce5adba7..00000000 --- a/liep/luci-app-control-webrestriction/root/etc/uci-defaults/luci-app-control-webrestriction +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci_app_control_webrestriction[-1] - add ucitrack luci_app_control_webrestriction - set ucitrack.@luci_app_control_webrestriction[-1].init=luci-app-control-webrestriction - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-control-weburl/root/etc/uci-defaults/luci-app-control-weburl b/liep/luci-app-control-weburl/root/etc/uci-defaults/luci-app-control-weburl deleted file mode 100755 index 62ed7fb3..00000000 --- a/liep/luci-app-control-weburl/root/etc/uci-defaults/luci-app-control-weburl +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci_app_control_weburl[-1] - add ucitrack luci_app_control_weburl - set ucitrack.@luci_app_control_weburl[-1].init=luci-app-control-weburl - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-filebrowser/root/etc/uci-defaults/luci-app-filebrowser b/liep/luci-app-filebrowser/root/etc/uci-defaults/luci-app-filebrowser deleted file mode 100755 index dccfffa7..00000000 --- a/liep/luci-app-filebrowser/root/etc/uci-defaults/luci-app-filebrowser +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@filebrowser[-1] - add ucitrack filebrowser - set ucitrack.@filebrowser[-1].init=filebrowser - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-guest-wifi/root/etc/uci-defaults/luci-app-guest-wifi b/liep/luci-app-guest-wifi/root/etc/uci-defaults/luci-app-guest-wifi deleted file mode 100755 index 67c275af..00000000 --- a/liep/luci-app-guest-wifi/root/etc/uci-defaults/luci-app-guest-wifi +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@guest-wifi[-1] - add ucitrack guest-wifi - set ucitrack.@guest-wifi[-1].init=guest-wifi - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-ipsec-server/root/etc/uci-defaults/luci-app-ipsec-server b/liep/luci-app-ipsec-server/root/etc/uci-defaults/luci-app-ipsec-server index 3a791a03..920ed4d9 100755 --- a/liep/luci-app-ipsec-server/root/etc/uci-defaults/luci-app-ipsec-server +++ b/liep/luci-app-ipsec-server/root/etc/uci-defaults/luci-app-ipsec-server @@ -8,13 +8,6 @@ uci -q batch <<-EOF >/dev/null set firewall.luci_app_ipsec_server.reload=1 EOF -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci-app-ipsec-server[-1] - add ucitrack luci-app-ipsec-server - set ucitrack.@luci-app-ipsec-server[-1].init=luci-app-ipsec-server - commit ucitrack -EOF - /etc/init.d/ipsec disable 2>/dev/null /etc/init.d/ipsec stop 2>/dev/null /etc/init.d/xl2tpd disable 2>/dev/null diff --git a/liep/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer b/liep/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer index 618c4a00..adee2560 100644 --- a/liep/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer +++ b/liep/luci-app-kodexplorer/root/etc/uci-defaults/luci-app-kodexplorer @@ -1,12 +1,5 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@kodexplorer[-1] - add ucitrack kodexplorer - set ucitrack.@kodexplorer[-1].init=kodexplorer - commit ucitrack -EOF - /etc/init.d/php8-fpm stop /etc/init.d/php8-fpm disable rm -rf /tmp/luci-*cache diff --git a/liep/luci-app-nginx-pingos/Makefile b/liep/luci-app-nginx-pingos/Makefile index fd04e71a..f59a5d8e 100644 --- a/liep/luci-app-nginx-pingos/Makefile +++ b/liep/luci-app-nginx-pingos/Makefile @@ -74,9 +74,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./root/etc/init.d/pingos $(1)/etc/init.d/pingos - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_CONF) ./root/etc/uci-defaults/* $(1)/etc/uci-defaults - $(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d cp -pR ./root/usr/share/rpcd/acl.d/* $(1)/usr/share/rpcd/acl.d diff --git a/liep/luci-app-nginx-pingos/root/etc/uci-defaults/luci-app-nginx-pingos b/liep/luci-app-nginx-pingos/root/etc/uci-defaults/luci-app-nginx-pingos deleted file mode 100755 index cd6d3ff8..00000000 --- a/liep/luci-app-nginx-pingos/root/etc/uci-defaults/luci-app-nginx-pingos +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@pingos[-1] - add ucitrack pingos - set ucitrack.@pingos[-1].init=pingos - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-openvpn-server/root/etc/uci-defaults/luci-app-openvpn-server b/liep/luci-app-openvpn-server/root/etc/uci-defaults/luci-app-openvpn-server index d4bdf808..e10f09e4 100755 --- a/liep/luci-app-openvpn-server/root/etc/uci-defaults/luci-app-openvpn-server +++ b/liep/luci-app-openvpn-server/root/etc/uci-defaults/luci-app-openvpn-server @@ -27,11 +27,6 @@ uci -q batch <<-EOF >/dev/null set firewall.lantoovpnserver.src='lan' set firewall.lantoovpnserver.dest='ovpn_server' commit firewall - - delete ucitrack.@luci-app-openvpn-server[-1] - add ucitrack luci-app-openvpn-server - set ucitrack.@luci-app-openvpn-server[-1].init=luci-app-openvpn-server - commit ucitrack EOF rm -rf /tmp/luci-*cache diff --git a/liep/luci-app-pppoe-relay/root/etc/uci-defaults/luci-app-pppoe-relay b/liep/luci-app-pppoe-relay/root/etc/uci-defaults/luci-app-pppoe-relay deleted file mode 100755 index 41436936..00000000 --- a/liep/luci-app-pppoe-relay/root/etc/uci-defaults/luci-app-pppoe-relay +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci-app-pppoe-relay[-1] - add ucitrack luci-app-pppoe-relay - set ucitrack.@luci-app-pppoe-relay[-1].init=luci-app-luci-app-pppoe-relay - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-pppoe-server/root/etc/uci-defaults/luci-app-pppoe-server b/liep/luci-app-pppoe-server/root/etc/uci-defaults/luci-app-pppoe-server index 6e71897c..1e484c87 100755 --- a/liep/luci-app-pppoe-server/root/etc/uci-defaults/luci-app-pppoe-server +++ b/liep/luci-app-pppoe-server/root/etc/uci-defaults/luci-app-pppoe-server @@ -8,12 +8,5 @@ uci -q batch <<-EOF >/dev/null set firewall.luci_app_pppoe_server.reload=1 EOF -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci-app-pppoe-server[-1] - add ucitrack luci-app-pppoe-server - set ucitrack.@luci-app-pppoe-server[-1].init=luci-app-pppoe-server - commit ucitrack -EOF - rm -rf /tmp/luci-*cache exit 0 diff --git a/liep/luci-app-pptp-server/root/etc/uci-defaults/luci-app-pptp-server b/liep/luci-app-pptp-server/root/etc/uci-defaults/luci-app-pptp-server index e7e0542e..5e7c614a 100755 --- a/liep/luci-app-pptp-server/root/etc/uci-defaults/luci-app-pptp-server +++ b/liep/luci-app-pptp-server/root/etc/uci-defaults/luci-app-pptp-server @@ -8,13 +8,6 @@ uci -q batch <<-EOF >/dev/null set firewall.luci_app_pptp_server.reload=1 EOF -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci-app-pptp-server[-1] - add ucitrack luci-app-pptp-server - set ucitrack.@luci-app-pptp-server[-1].init=luci-app-pptp-server - commit ucitrack -EOF - /etc/init.d/pptpd disable 2>/dev/null /etc/init.d/pptpd stop 2>/dev/null rm -rf /tmp/luci-*cache diff --git a/liep/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn b/liep/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn index cf8f4f02..89e04693 100755 --- a/liep/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn +++ b/liep/luci-app-softethervpn/root/etc/uci-defaults/luci-app-softethervpn @@ -8,13 +8,6 @@ uci -q batch <<-EOF >/dev/null set firewall.luci_app_softethervpn.reload=1 EOF -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci-app-softethervpn[-1] - add ucitrack luci-app-softethervpn - set ucitrack.@luci-app-softethervpn[-1].init=luci-app-softethervpn - commit ucitrack -EOF - /etc/init.d/softethervpnserver stop 2>/dev/null /etc/init.d/softethervpnserver disable 2>/dev/null diff --git a/liep/luci-app-ssr-mudb-server/root/etc/uci-defaults/luci-app-ssr-mudb-server b/liep/luci-app-ssr-mudb-server/root/etc/uci-defaults/luci-app-ssr-mudb-server index 157e67d9..bc517344 100755 --- a/liep/luci-app-ssr-mudb-server/root/etc/uci-defaults/luci-app-ssr-mudb-server +++ b/liep/luci-app-ssr-mudb-server/root/etc/uci-defaults/luci-app-ssr-mudb-server @@ -8,13 +8,6 @@ uci -q batch <<-EOF >/dev/null set firewall.ssr_mudb_server.reload=1 EOF -uci -q batch <<-EOF >/dev/null - delete ucitrack.@ssr_mudb_server[-1] - add ucitrack ssr_mudb_server - set ucitrack.@ssr_mudb_server[-1].init=ssr_mudb_server - commit ucitrack -EOF - chmod a+x /usr/share/ssr_mudb_server/* >/dev/null 2>&1 cp -rf /usr/bin/python3 /usr/bin/python rm -rf /tmp/luci-*cache diff --git a/liep/luci-app-syncthing/root/etc/uci-defaults/luci-app-syncthing b/liep/luci-app-syncthing/root/etc/uci-defaults/luci-app-syncthing deleted file mode 100644 index d09dc970..00000000 --- a/liep/luci-app-syncthing/root/etc/uci-defaults/luci-app-syncthing +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -touch /etc/config/luci-app-syncthing - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci-app-syncthing[-1] - add ucitrack luci-app-syncthing - set ucitrack.@luci-app-syncthing[-1].exec='/etc/init.d/luci-app-syncthing restart' - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/liep/luci-app-timecontrol/root/etc/uci-defaults/luci-app-timecontrol b/liep/luci-app-timecontrol/root/etc/uci-defaults/luci-app-timecontrol index 6abd2e9b..aa3b8d6b 100755 --- a/liep/luci-app-timecontrol/root/etc/uci-defaults/luci-app-timecontrol +++ b/liep/luci-app-timecontrol/root/etc/uci-defaults/luci-app-timecontrol @@ -8,12 +8,5 @@ uci -q batch <<-EOF >/dev/null set firewall.luci_app_timecontrol.reload=1 EOF -uci -q batch <<-EOF >/dev/null - delete ucitrack.@luci-app-timecontrol[-1] - add ucitrack luci-app-timecontrol - set ucitrack.@luci-app-timecontrol[-1].init=luci-app-timecontrol - commit ucitrack -EOF - rm -rf /tmp/luci-*cache exit 0 diff --git a/liep/luci-app-verysync/root/etc/uci-defaults/luci-app-verysync b/liep/luci-app-verysync/root/etc/uci-defaults/luci-app-verysync deleted file mode 100644 index f7880bf7..00000000 --- a/liep/luci-app-verysync/root/etc/uci-defaults/luci-app-verysync +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@verysync[-1] - add ucitrack verysync - set ucitrack.@verysync[-1].init=verysync - commit ucitrack -EOF - -rm -rf /tmp/luci-*cache -exit 0 diff --git a/luci-app-passwall/root/usr/share/passwall/nftables.sh b/luci-app-passwall/root/usr/share/passwall/nftables.sh index ba7f5432..4784e7c8 100755 --- a/luci-app-passwall/root/usr/share/passwall/nftables.sh +++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh @@ -236,7 +236,9 @@ gen_nftset() { nft "add set $NFTABLE_NAME $nftset_name { type $ip_type; flags interval, timeout; timeout $timeout_argument_set; gc-interval $gc_interval_time; auto-merge; }" fi fi - [ $# -gt 0 ] || [ ! -t 0 ] && insert_nftset "$nftset_name" "$@" + if [ $# -gt 0 ]; then + insert_nftset "$nftset_name" "$@" + fi } get_jump_nft() {