diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/ffluci-upload | 4 | ||||
| -rw-r--r-- | contrib/package/ffluci/Makefile | 1 | ||||
| -rwxr-xr-x | contrib/package/ffluci/ipkg/ffluci.postinst | 9 |
3 files changed, 12 insertions, 2 deletions
diff --git a/contrib/ffluci-upload b/contrib/ffluci-upload new file mode 100755 index 0000000000..0128c2dd73 --- /dev/null +++ b/contrib/ffluci-upload @@ -0,0 +1,4 @@ +#!/usr/bin/haserl --shell=luac --upload-limit=6144 +-- This is a bit hacky: remove -upload from SCRIPT_NAME +ENV.SCRIPT_NAME = ENV.SCRIPT_NAME:sub(1, #ENV.SCRIPT_NAME - 7) +dofile("ffluci")
\ No newline at end of file diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile index 9ec4f311aa..f10476e898 100644 --- a/contrib/package/ffluci/Makefile +++ b/contrib/package/ffluci/Makefile @@ -44,6 +44,7 @@ define Package/ffluci/install $(CP) $(PKG_BUILD_DIR)/dist/* $(1)/usr/lib/lua/ -R $(CP) $(PKG_BUILD_DIR)/contrib/media $(1)/www/ffluci/ -R $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/ffluci $(1)/www/cgi-bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/ffluci-upload $(1)/www/cgi-bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/index.cgi $(1)/www/cgi-bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/index.html $(1)/www $(CP) $(PKG_BUILD_DIR)/contrib/uci/luci $(1)/etc/config/luci diff --git a/contrib/package/ffluci/ipkg/ffluci.postinst b/contrib/package/ffluci/ipkg/ffluci.postinst index 7265cb96b8..97ada182d5 100755 --- a/contrib/package/ffluci/ipkg/ffluci.postinst +++ b/contrib/package/ffluci/ipkg/ffluci.postinst @@ -1,4 +1,9 @@ #!/bin/sh -PATTERN='/cgi-bin/ffluci/admin:root:$p$root' -grep $PATTERN ${IPKG_INSTROOT}/etc/httpd.conf >/dev/null 2>/dev/null || echo $PATTERN >> ${IPKG_INSTROOT}/etc/httpd.conf +PATTERNS='/cgi-bin/ffluci/admin:root:$p$root /cgi-bin/ffluci-upload:root:$p$root' + +for i in "$PATTERNS" +do + grep "$i" ${IPKG_INSTROOT}/etc/httpd.conf >/dev/null 2>/dev/null || echo "$i" >> ${IPKG_INSTROOT}/etc/httpd.conf +done + [ -n ${IPKG_INSTROOT} ] || /etc/init.d/httpd restart |