enable ngx_lua_waf

addons.sh

@@ -177,6 +177,7 @@ What Are You Doing?
 \t${CMSG} 8${CEND}. Install/Uninstall xdebug PHP Extension
 \t${CMSG} 9${CEND}. Install/Uninstall PHP Composer
 \t${CMSG}10${CEND}. Install/Uninstall fail2ban
+\t${CMSG}11${CEND}. Install/Uninstall ngx_lua_waf 
 \t${CMSG} q${CEND}. Exit
 "
   read -p "Please input the correct option: " Number

include/ngx_lua_waf.sh

@@ -23,6 +23,7 @@ Nginx_lua_waf() {
     src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.6.tar.gz && Download_src
     tar xzf lua-cjson-2.1.0.6.tar.gz
     pushd lua-cjson-2.1.0.6
+    sed -i 's@LUA_INCLUDE_DIR.*@LUA_INCLUDE_DIR \?=   \$(PREFIX)/include/luajit-2.1@' Makefile
     make && make install
     popd > /dev/null
   fi
@@ -79,6 +80,7 @@ Tengine_lua_waf() {
     src_url=http://mirrors.linuxeye.com/oneinstack/src/lua-cjson-2.1.0.6.tar.gz && Download_src
     tar xzf lua-cjson-2.1.0.6.tar.gz
     pushd lua-cjson-2.1.0.6
+    sed -i 's@LUA_INCLUDE_DIR.*@LUA_INCLUDE_DIR \?=   \$(PREFIX)/include/luajit-2.1@' Makefile
     make && make install
     popd > /dev/null
   fi
@@ -102,7 +104,7 @@ Tengine_lua_waf() {
     sed -i 's@CFLAGS="$CFLAGS -g"@#CFLAGS="$CFLAGS -g"@' auto/cc/gcc # close debug
     export LUAJIT_LIB=/usr/local/lib
     export LUAJIT_INC=/usr/local/include/luajit-2.1
-    ./configure ${tengine_configure_args} --add-module=../lua-nginx-module --add-module=../ngx_devel_kit 
+    ./configure ${tengine_configure_args} --add-module=../lua-nginx-module --add-module=../ngx_devel_kit
     make -j ${THREAD}
     if [ -f "objs/nginx" ]; then
       /bin/mv ${tengine_install_dir}/sbin/nginx{,`date +%m%d`}
@@ -128,6 +130,7 @@ Tengine_lua_waf() {
 enable_lua_waf() {
   pushd ${oneinstack_dir}/src > /dev/null
   . ../include/check_dir.sh
+  rm -f ngx_lua_waf.tar.gz
   src_url=http://mirrors.linuxeye.com/oneinstack/src/ngx_lua_waf.tar.gz && Download_src
   tar xzf ngx_lua_waf.tar.gz -C ${web_install_dir}/conf
   sed -i "s@/usr/local/nginx@${web_install_dir}@g" ${web_install_dir}/conf/waf.conf
@@ -138,6 +141,7 @@ enable_lua_waf() {
   if [ $? -eq 0 ]; then
     service nginx reload
     echo "${CSUCCESS}ngx_lua_waf enabled successfully! ${CEND}"
+    chown ${run_user} ${wwwlogs_dir}
   else
     echo "${CFAILURE}ngx_lua_waf enable failed! ${CEND}"
   fi

versions.txt

@@ -5,8 +5,8 @@ tengine_ver=2.2.2
 openresty_ver=1.13.6.2
 openssl_ver=1.0.2o
 
-tomcat9_ver=9.0.8
-tomcat8_ver=8.5.31
+tomcat9_ver=9.0.10
+tomcat8_ver=8.5.32
 tomcat7_ver=7.0.88
 tomcat6_ver=6.0.53
 
@@ -24,7 +24,7 @@ mysql56_ver=5.6.40
 mysql55_ver=5.5.60
 
 mariadb103_ver=10.3.7
-mariadb102_ver=10.2.15
+mariadb102_ver=10.2.16
 mariadb101_ver=10.1.34
 mariadb100_ver=10.0.35
 mariadb55_ver=5.5.60