diff --git a/luci-nginxer/Makefile b/luci-nginxer/Makefile index 335bcacde..1caf4ec07 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.2 -PKG_RELEASE:=17 +PKG_VERSION:=0.0.1 +PKG_RELEASE:=18 LUCI_DEPENDS:=+luci-nginx define Package/luci-nginxer/postrm #!/bin/sh -/etc/init.d/uhttpd enable +/etc/init.d/uhttpd enabled /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 18e28cfdd..9d01f3982 100644 --- a/luci-nginxer/root/etc/uci-defaults/50_luci-nginxer +++ b/luci-nginxer/root/etc/uci-defaults/50_luci-nginxer @@ -8,11 +8,7 @@ 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 +exit 0 \ No newline at end of file diff --git a/luci-theme-argon/Makefile b/luci-theme-argon/Makefile index 0b6ecbb6c..ac6fa95fd 100644 --- a/luci-theme-argon/Makefile +++ b/luci-theme-argon/Makefile @@ -12,7 +12,7 @@ LUCI_DEPENDS:=+luci-base +USE_APK:wget-any +!USE_APK:wget +jsonfilter +ucode-mod # Keep existing translation package names and the argon-config message domain. LUCI_BASENAME:=argon-config PKG_VERSION:=3.1.1 -PKG_RELEASE:=36 +PKG_RELEASE:=37 PKG_LICENSE:=Apache-2.0 MIT # LuCI derives translations independently of the theme version. Keep release diff --git a/luci-theme-argon/compat/luci-app-argon-config/Makefile b/luci-theme-argon/compat/luci-app-argon-config/Makefile deleted file mode 100644 index 47e43d0f1..000000000 --- a/luci-theme-argon/compat/luci-app-argon-config/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=luci-app-argon-config -PKG_VERSION:=3.1.1 -PKG_RELEASE:=20261028 -PKG_LICENSE:=Apache-2.0 - -LUCI_TITLE:=Argon configuration compatibility package -LUCI_PKGARCH:=all -# Upgrade this empty package before installing the integrated theme. Keeping -# the dependency unversioned lets an existing theme satisfy this first step. -LUCI_DEPENDS:=+luci-theme-argon - -# Save even an unchanged legacy conffile before the empty package releases it. -# The integrated theme consumes this private backup on its first initialization. -define Package/luci-app-argon-config/preinst -#!/bin/sh -root="$${IPKG_INSTROOT}" -if [ ! -f "$$root/usr/share/argon/config-integrated" ] && \ - [ -f "$$root/etc/config/argon" ]; then - umask 077 - mkdir -p "$$root/etc/argon-config-migration" || exit 1 - cp -p "$$root/etc/config/argon" "$$root/etc/argon-config-migration/argon" || exit 1 -fi -exit 0 -endef - -include $(TOPDIR)/feeds/luci/luci.mk - -# call BuildPackage - make this nested recipe visible to OpenWrt package scans.