diff --git a/firewall4/Makefile b/firewall4/Makefile index e4ceae4d3..b4699b1e9 100644 --- a/firewall4/Makefile +++ b/firewall4/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git @@ -26,7 +26,7 @@ define Package/firewall4 +kmod-nft-nat +kmod-nft-fullcone \ +nftables-json \ +ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci \ - +iptables +ip6tables +kmod-nft-fullcone +kmod-nft-socket +kmod-nft-tproxy + +iptables +ip6tables +kmod-nft-fullcone +kmod-nft-socket +kmod-nft-tproxy EXTRA_DEPENDS:=ucode (>=2022.03.22) PROVIDES:=uci-firewall DEFAULT_VARIANT:=1 diff --git a/luci-nginxer/Makefile b/luci-nginxer/Makefile index 2b1fc5644..335bcacde 100644 --- a/luci-nginxer/Makefile +++ b/luci-nginxer/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Nginxer LUCI_DESCRIPTION:=Standard OpenWrt set including full admin with ppp support and the default Bootstrap theme -PKG_VERSION:=0.0.1 -PKG_RELEASE:=16 +PKG_VERSION:=0.0.2 +PKG_RELEASE:=17 LUCI_DEPENDS:=+luci-nginx define Package/luci-nginxer/postrm #!/bin/sh -/etc/init.d/uhttpd enabled +/etc/init.d/uhttpd enable /etc/init.d/uhttpd start exit 0 endef diff --git a/luci-nginxer/root/etc/uci-defaults/50_luci-nginxer b/luci-nginxer/root/etc/uci-defaults/50_luci-nginxer index 9d01f3982..18e28cfdd 100644 --- a/luci-nginxer/root/etc/uci-defaults/50_luci-nginxer +++ b/luci-nginxer/root/etc/uci-defaults/50_luci-nginxer @@ -8,7 +8,11 @@ if [ "$nginxer" != 1 ]; then uci set nginx._redirect2ssl.access_log='off; # logd openwrt' uci set nginx.global.nginxer='1' uci commit nginx + + # fix firmware upload failed + sed -i 's/client_max_body_size 128M;/client_max_body_size 256M;/g' /etc/nginx/uci.conf.template + # /etc/init.d/uhttpd running || /etc/init.d/uhttpd disable /etc/init.d/nginx reload fi -exit 0 \ No newline at end of file +exit 0