[source] uhttpd: Enable integrated Lua by default

LEDE Commits lede-commits at lists.infradead.org
Tue May 16 08:23:22 PDT 2017


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/324ec18615c496049653a03fdd25e8c0507e65cc

commit 324ec18615c496049653a03fdd25e8c0507e65cc
Author: Ansuel Smith <ansuelsmth at gmail.com>
AuthorDate: Sun Mar 26 15:17:06 2017 +0200

    uhttpd: Enable integrated Lua by default
    
    We enabled lua interpreter by default as it doesn't make any problem in the uhttpd config file and we modify the index page to use it.
    
    Signed-off-by: Ansuel Smith <ansuelsmth at gmail.com>
---
 package/network/services/uhttpd/Makefile            | 17 +++++++++++++++--
 package/network/services/uhttpd/files/uhttpd.config |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index 39e8894..3d483b6 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(LEDE_GIT)/project/uhttpd.git
@@ -46,9 +46,12 @@ define Package/uhttpd/config
   config PACKAGE_uhttpd_debug
     bool "Build with debug messages"
     default n
+  config uhttpd_lua
+    depends on PACKAGE_uhttpd-mod-lua
+    bool "Enable Integrated Lua interpreter"
+	default y
 endef
 
-
 define Package/uhttpd-mod-lua
   $(Package/uhttpd/default)
   TITLE+= (Lua plugin)
@@ -106,6 +109,16 @@ define Package/uhttpd-mod-ubus/install
 	$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
 endef
 
+define Package/uhttpd-mod-lua/postinst
+	$(if $(CONFIG_uhttpd_lua),
+	#!/bin/sh
+	if [ -f $${IPKG_INSTROOT}/www/index.html ]
+	then
+		sed -e 's:/cgi-bin::g' -i $${IPKG_INSTROOT}/www/index.html
+	fi
+	,)
+endef
+
 
 $(eval $(call BuildPackage,uhttpd))
 $(eval $(call BuildPackage,uhttpd-mod-lua))
diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config
index 89f99aa..563c079 100644
--- a/package/network/services/uhttpd/files/uhttpd.config
+++ b/package/network/services/uhttpd/files/uhttpd.config
@@ -51,8 +51,8 @@ config uhttpd main
 
 	# Lua url prefix and handler script.
 	# Lua support is disabled if no prefix given.
-#	option lua_prefix	/luci
-#	option lua_handler	/usr/lib/lua/luci/sgi/uhttpd.lua
+	option lua_prefix	/luci
+	option lua_handler	/usr/lib/lua/luci/sgi/uhttpd.lua
 
 	# Specify the ubus-rpc prefix and socket path.
 #	option ubus_prefix	/ubus



More information about the lede-commits mailing list