Add yaf and update versions.txt

backup.sh

@@ -110,20 +110,24 @@ DB_GDRIVE_BK() {
   # get the IP information
   IPADDR=$(../include/get_ipaddr.py)
   IPADDR=${IPADDR:-127.0.0.1}
-  Parent_root_id=$(/usr/local/bin/gdrive list --no-header -q "trashed = false and name = '${IPADDR}'" | awk '{print $1}')
-  [ -z "${Parent_root_id}" ] && Parent_root_id=$(/usr/local/bin/gdrive mkdir ${IPADDR} | awk '{print $2}')
-  Parent_sub_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F`'" | awk '{print $1}')
-  [ -z "${Parent_sub_id}" ] && Parent_sub_id=$(/usr/local/bin/gdrive mkdir -p ${Parent_root_id} `date +%F` | awk '{print $2}')
+  Parent_root_id=$(/usr/local/bin/gdrive list --no-header -q "trashed = false and name = '${IPADDR}'" | awk '{print $1}' | head -1)
+  [ -z "${Parent_root_id}" ] && sleep 60 && Parent_root_id=$(/usr/local/bin/gdrive mkdir ${IPADDR} | awk '{print $2}')
+  sleep 60
+  Parent_sub_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F`'" | awk '{print $1}' | head -1)
+  [ -z "${Parent_sub_id}" ] && sleep 60 && Parent_sub_id=$(/usr/local/bin/gdrive mkdir -p ${Parent_root_id} `date +%F` | awk '{print $2}')
+  sleep 60
   for D in `echo ${db_name} | tr ',' ' '`
   do
     ./db_bk.sh ${D}
     DB_GREP="DB_${D}_`date +%Y%m%d`"
     DB_FILE=`ls -lrt ${backup_dir} | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
     /usr/local/bin/gdrive upload -p ${Parent_sub_id} ${backup_dir}/${DB_FILE}
+    sleep 120
     if [ $? -eq 0 ]; then
-      Parent_expired_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F --date="${expired_days} days ago"`'" | awk '{print $1}')
-      [ -n "${Parent_expired_id}" ] && /usr/local/bin/gdrive delete -r ${Parent_expired_id} > /dev/null 2>&1
+      Parent_expired_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F --date="${expired_days} days ago"`'" | awk '{print $1}' | head -1)
+      [ -n "${Parent_expired_id}" ] && sleep 60 && /usr/local/bin/gdrive delete -r ${Parent_expired_id} > /dev/null 2>&1
       [ -z "`echo ${backup_destination} | grep -ow 'local'`" ] && rm -f ${backup_dir}/${DB_FILE}
+      sleep 60
     fi
   done
 }
@@ -263,10 +267,12 @@ WEB_GDRIVE_BK() {
   # get the IP information
   IPADDR=$(../include/get_ipaddr.py)
   IPADDR=${IPADDR:-127.0.0.1}
-  Parent_root_id=$(/usr/local/bin/gdrive list --no-header -q "trashed = false and name = '${IPADDR}'" | awk '{print $1}')
-  [ -z "${Parent_root_id}" ] && Parent_root_id=$(/usr/local/bin/gdrive mkdir ${IPADDR} | awk '{print $2}')
-  Parent_sub_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F`'" | awk '{print $1}')
-  [ -z "${Parent_sub_id}" ] && Parent_sub_id=$(/usr/local/bin/gdrive mkdir -p ${Parent_root_id} `date +%F` | awk '{print $2}')
+  Parent_root_id=$(/usr/local/bin/gdrive list --no-header -q "trashed = false and name = '${IPADDR}'" | awk '{print $1}' | head -1)
+  [ -z "${Parent_root_id}" ] && sleep 60 && Parent_root_id=$(/usr/local/bin/gdrive mkdir ${IPADDR} | awk '{print $2}')
+  sleep 60
+  Parent_sub_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F`'" | awk '{print $1}' | head -1)
+  [ -z "${Parent_sub_id}" ] && sleep 60 && Parent_sub_id=$(/usr/local/bin/gdrive mkdir -p ${Parent_root_id} `date +%F` | awk '{print $2}')
+  sleep 60
   for W in `echo ${website_name} | tr ',' ' '`
   do
     [ ! -e "${wwwroot_dir}/${WebSite}" ] && { echo "[${wwwroot_dir}/${WebSite}] not exist"; break; }
@@ -278,10 +284,12 @@ WEB_GDRIVE_BK() {
       popd > /dev/null
     fi
     /usr/local/bin/gdrive upload -p ${Parent_sub_id} ${PUSH_FILE}
+    sleep 120
     if [ $? -eq 0 ]; then
-      Parent_expired_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F --date="${expired_days} days ago"`'" | awk '{print $1}')
-      [ -n "${Parent_expired_id}" ] && /usr/local/bin/gdrive delete -r ${Parent_expired_id} > /dev/null 2>&1
+      Parent_expired_id=$(/usr/local/bin/gdrive list --no-header -q "'${Parent_root_id}' in parents and trashed = false and name = '`date +%F --date="${expired_days} days ago"`'" | awk '{print $1}' | head -1)
+      [ -n "${Parent_expired_id}" ] && sleep 60 && /usr/local/bin/gdrive delete -r ${Parent_expired_id} > /dev/null 2>&1
       [ -z "`echo ${backup_destination} | grep -ow 'local'`" ] && rm -f ${PUSH_FILE}
+      sleep 60
     fi
   done
 }

include/check_sw.sh

@@ -194,6 +194,13 @@ installDepsBySrc() {
   else
     echo "No need to install software from source packages."
   fi
-  echo 'already initialize' > ~/.oneinstack
+
+  if command -v lsof >/dev/null 2>&1; then
+    echo 'already initialize' > ~/.oneinstack
+  else
+    echo "${CFAILURE}${PM} config error parsing file failed${CEND}"
+    kill -9 $$
+  fi
+
   popd > /dev/null
 }

include/ngx_lua_waf.sh

@@ -13,9 +13,9 @@ Nginx_lua_waf() {
   [ ! -e "${nginx_install_dir}/sbin/nginx" ] && echo "${CWARNING}Nginx is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190221.tar.gz && Download_src
-    tar xzf luajit2-2.1-20190221.tar.gz
-    pushd luajit2-2.1-20190221
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190228.tar.gz && Download_src
+    tar xzf luajit2-2.1-20190228.tar.gz
+    pushd luajit2-2.1-20190228
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null
@@ -76,9 +76,9 @@ Tengine_lua_waf() {
   [ ! -e "${tengine_install_dir}/sbin/nginx" ] && echo "${CWARNING}Tengine is not installed on your system! ${CEND}" && exit 1
   if [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ]; then
     [ -e "/usr/local/lib/libluajit-5.1.so.2.0.5" ] && find /usr/local -name *luajit* | xargs rm -rf
-    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190221.tar.gz && Download_src
-    tar xzf luajit2-2.1-20190221.tar.gz
-    pushd luajit2-2.1-20190221
+    src_url=http://mirrors.linuxeye.com/oneinstack/src/luajit2-2.1-20190228.tar.gz && Download_src
+    tar xzf luajit2-2.1-20190228.tar.gz
+    pushd luajit2-2.1-20190228
     make && make install
     [ ! -e "/usr/local/lib/libluajit-5.1.so.2.1.0" ] && { echo "${CFAILURE}LuaJIT install failed! ${CEND}"; kill -9 $$; }
     popd > /dev/null

include/pecl_yaf.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# Author:  yeho <lj2007331 AT gmail.com>
+# BLOG:  https://linuxeye.com
+#
+# Notes: OneinStack for CentOS/RedHat 6+ Debian 7+ and Ubuntu 12+
+#
+# Project home page:
+#       https://oneinstack.com
+#       https://github.com/oneinstack/oneinstack
+
+Install_pecl_yaf() {
+  if [ -e "${php_install_dir}/bin/phpize" ]; then
+    pushd ${oneinstack_dir}/src > /dev/null
+    PHP_detail_ver=$(${php_install_dir}/bin/php-config --version)
+    PHP_main_ver=${PHP_detail_ver%.*}
+    if [[ "${PHP_main_ver}" =~ ^7.[0-3]$ ]]; then
+      phpExtensionDir=$(${php_install_dir}/bin/php-config --extension-dir)
+      src_url=http://mirrors.linuxeye.com/oneinstack/src/yaf-${yaf_ver}.tar.gz && Download_src
+      tar xzf yaf-${yaf_ver}.tar.gz
+      pushd yaf-${yaf_ver} > /dev/null
+      ${php_install_dir}/bin/phpize
+      ./configure --with-php-config=${php_install_dir}/bin/php-config
+      make -j ${THREAD} && make install
+      popd > /dev/null
+      if [ -f "${phpExtensionDir}/yaf.so" ]; then
+        echo 'extension=yaf.so' > ${php_install_dir}/etc/php.d/04-yaf.ini
+        echo "${CSUCCESS}PHP yaf module installed successfully! ${CEND}"
+        rm -rf yaf-${yaf_ver}
+      else
+        echo "${CFAILURE}PHP yaf module install failed, Please contact the author! ${CEND}"
+      fi
+    else
+      echo "${CWARNING}Your php ${PHP_detail_ver} does not support yaf! ${CEND}";
+    fi
+    popd > /dev/null
+  fi
+}
+
+Uninstall_pecl_yaf() {
+  if [ -e "${php_install_dir}/etc/php.d/04-yaf.ini" ]; then
+    rm -f ${php_install_dir}/etc/php.d/04-yaf.ini
+    echo; echo "${CMSG}PHP yaf module uninstall completed${CEND}"
+  else
+    echo; echo "${CWARNING}PHP yaf module does not exist! ${CEND}"
+  fi
+}

install.sh

@@ -55,7 +55,7 @@ Show_Help() {
   --phpcache_option [1-4]     Install PHP opcode cache, default: 1 opcache
   --php_extensions [ext name] Install PHP extensions, include zendguardloader,ioncube,
                               sourceguardian,imagick,gmagick,fileinfo,imap,ldap,phalcon,
-                              redis,memcached,memcache,mongodb,swoole,xdebug
+                              yaf,redis,memcached,memcache,mongodb,swoole,xdebug
   --tomcat_option [1-4]       Install Tomcat version
   --jdk_option [1-4]          Install JDK version
   --db_option [1-15]          Install DB version
@@ -131,6 +131,7 @@ while :; do
       [ -n "`echo ${php_extensions} | grep -w imap`" ] && pecl_imap=1
       [ -n "`echo ${php_extensions} | grep -w ldap`" ] && pecl_ldap=1
       [ -n "`echo ${php_extensions} | grep -w phalcon`" ] && pecl_phalcon=1
+      [ -n "`echo ${php_extensions} | grep -w yaf`" ] && pecl_yaf=1
       [ -n "`echo ${php_extensions} | grep -w redis`" ] && pecl_redis=1
       [ -n "`echo ${php_extensions} | grep -w memcached`" ] && pecl_memcached=1
       [ -n "`echo ${php_extensions} | grep -w memcache`" ] && pecl_memcache=1
@@ -998,6 +999,12 @@ PHP_addons() {
     Install_pecl_phalcon 2>&1 | tee -a ${oneinstack_dir}/install.log
   fi
 
+  # yaf
+  if [ "${pecl_yaf}" == '1' ]; then
+    . include/pecl_yaf.sh
+    Install_pecl_yaf 2>&1 | tee -a ${oneinstack_dir}/install.log
+  fi
+
   # pecl_memcached
   if [ "${pecl_memcached}" == '1' ]; then
     . include/memcached.sh

ss.sh

@@ -215,7 +215,7 @@ Install_SS_python() {
 }
 
 Install_SS_libev() {
-  src_url=http://mirrors.linuxeye.com/oneinstack/src/shadowsocks-libev-3.2.3.tar.gz && Download_src
+  src_url=http://mirrors.linuxeye.com/oneinstack/src/shadowsocks-libev-3.2.4.tar.gz && Download_src
   src_url=http://mirrors.linuxeye.com/oneinstack/src/libsodium-${libsodium_ver}.tar.gz && Download_src
   src_url=http://mirrors.linuxeye.com/oneinstack/src/mbedtls-2.16.0-apache.tgz && Download_src
   if [ ! -e "/usr/local/lib/libsodium.la" ]; then
@@ -231,8 +231,8 @@ Install_SS_libev() {
   make SHARED=1 CFLAGS=-fPIC
   make DESTDIR=/usr install
   popd > /dev/null
-  tar xzf shadowsocks-libev-3.2.3.tar.gz
-  pushd shadowsocks-libev-3.2.3 > /dev/null
+  tar xzf shadowsocks-libev-3.2.4.tar.gz
+  pushd shadowsocks-libev-3.2.4 > /dev/null
   make clean
   ./configure
   make -j ${THREAD} && make install
@@ -303,6 +303,7 @@ Config_SS() {
   [ "${ss_option}" == '1' ] && cat > /etc/shadowsocks/config.json << EOF
 {
     "server":"0.0.0.0",
+    "mode":"tcp_and_udp",
     "server_port":${SS_port},
     "local_port":1080,
     "password":"${SS_password}",

uninstall.sh

@@ -43,7 +43,7 @@ Show_Help() {
   --phpcache                    Uninstall PHP opcode cache
   --php_extensions [ext name]   Uninstall PHP extensions, include zendguardloader,ioncube,
                                 sourceguardian,imagick,gmagick,fileinfo,imap,ldap,phalcon,
-                                redis,memcached,memcache,mongodb,swoole,xdebug
+                                yaf,redis,memcached,memcache,mongodb,swoole,xdebug
   --hhvm                        Uninstall HHVM
   --pureftpd                    Uninstall PureFtpd
   --redis                       Uninstall Redis-server
@@ -119,6 +119,7 @@ while :; do
       [ -n "`echo ${php_extensions} | grep -w imap`" ] && pecl_imap=1
       [ -n "`echo ${php_extensions} | grep -w ldap`" ] && pecl_ldap=1
       [ -n "`echo ${php_extensions} | grep -w phalcon`" ] && pecl_phalcon=1
+      [ -n "`echo ${php_extensions} | grep -w yaf`" ] && pecl_yaf=1
       [ -n "`echo ${php_extensions} | grep -w redis`" ] && pecl_redis=1
       [ -n "`echo ${php_extensions} | grep -w memcached`" ] && pecl_memcached=1
       [ -n "`echo ${php_extensions} | grep -w memcache`" ] && pecl_memcache=1
@@ -396,6 +397,12 @@ Uninstall_PHPext() {
     Uninstall_pecl_phalcon
   fi
 
+  # yaf
+  if [ "${pecl_yaf}" == '1' ]; then
+    . include/pecl_yaf.sh
+    Uninstall_pecl_yaf 2>&1 | tee -a ${oneinstack_dir}/install.log
+  fi
+
   # pecl_memcached
   if [ "${pecl_memcached}" == '1' ]; then
     . include/memcached.sh

versions.txt

@@ -63,7 +63,7 @@ mcrypt_ver=2.6.8
 mhash_ver=0.9.9.9
 libsodium_ver=1.0.17
 argon2_ver=20171227
-imagemagick_ver=6.9.10-28
+imagemagick_ver=6.9.10-29
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.30
 gmagick_ver=2.0.5RC1
@@ -73,7 +73,8 @@ xcache_ver=3.2.0
 apcu_ver=5.1.17
 apcu_oldver=4.0.11
 eaccelerator_ver=0.9.6.1
-phalcon_ver=3.4.2
+phalcon_ver=3.4.3
+yaf_ver=3.0.8
 swoole_ver=4.2.13
 swoole_oldver=1.10.5
 xdebug_ver=2.6.1