lj2007331@gmail.com 6 years ago
parent
commit
54757524c1
5 changed files with 27 additions and 24 deletions
  1. 1 1
      README.md
  2. 20 18
      install.sh
  3. 1 1
      uninstall.sh
  4. 3 3
      versions.txt
  5. 2 1
      vhost.sh

+ 1 - 1
README.md

@@ -12,7 +12,7 @@ Script properties:
 - Providing a plurality of Tomcat version (Tomcat-9, Tomcat-8, Tomcat-7, Tomcat-6)
 - Providing a plurality of JDK version (JDK-11.0, JDK-1.8, JDK-1.7, JDK-1.6)
 - Providing a plurality of Apache version (Apache-2.4, Apache-2.2)
-- According to their needs to install PHP Cache Accelerator provides ZendOPcache, xcache, apcu, eAccelerator. And php extensions,include ZendGuardLoader,ionCube,SourceGuardian,imagick,gmagick,fileinfo,imap,ldap,phalcon,redis,memcached,memcache,mongodb,swoole,xdebug
+- According to their needs to install PHP Cache Accelerator provides ZendOPcache, xcache, apcu, eAccelerator. And php extensions,include ZendGuardLoader,ionCube,SourceGuardian,imagick,gmagick,fileinfo,imap,ldap,phalcon,yaf,redis,memcached,memcache,mongodb,swoole,xdebug
 - Installation Pureftpd, phpMyAdmin according to their needs
 - Install memcached, redis according to their needs
 - Jemalloc optimize MySQL, Nginx

+ 20 - 18
install.sh

@@ -626,24 +626,25 @@ if [ ${ARG_NUM} == 0 ]; then
       echo -e "\t${CMSG} 7${CEND}. Install imap"
       echo -e "\t${CMSG} 8${CEND}. Install ldap"
       echo -e "\t${CMSG} 9${CEND}. Install phalcon(PHP>=5.5)"
-      echo -e "\t${CMSG}10${CEND}. Install redis"
-      echo -e "\t${CMSG}11${CEND}. Install memcached"
-      echo -e "\t${CMSG}12${CEND}. Install memcache"
-      echo -e "\t${CMSG}13${CEND}. Install mongodb"
-      echo -e "\t${CMSG}14${CEND}. Install swoole"
-      echo -e "\t${CMSG}15${CEND}. Install xdebug(PHP>=5.5)"
-      read -e -p "Please input numbers:(Default '4 10 11' press Enter) " phpext_option
-      phpext_option=${phpext_option:-'4 10 11'}
+      echo -e "\t${CMSG}10${CEND}. Install yaf(PHP>=7.0)"
+      echo -e "\t${CMSG}11${CEND}. Install redis"
+      echo -e "\t${CMSG}12${CEND}. Install memcached"
+      echo -e "\t${CMSG}13${CEND}. Install memcache"
+      echo -e "\t${CMSG}14${CEND}. Install mongodb"
+      echo -e "\t${CMSG}15${CEND}. Install swoole"
+      echo -e "\t${CMSG}16${CEND}. Install xdebug(PHP>=5.5)"
+      read -e -p "Please input numbers:(Default '4 11 12' press Enter) " phpext_option
+      phpext_option=${phpext_option:-'4 11 12'}
       [ "${phpext_option}" == '0' ] && break
       array_phpext=(${phpext_option})
-      array_all=(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)
+      array_all=(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16)
       for v in ${array_phpext[@]}
       do
         [ -z "`echo ${array_all[@]} | grep -w ${v}`" ] && phpext_flag=1
       done
       if [ "${phpext_flag}" == '1' ]; then
         unset phpext_flag
-        echo; echo "${CWARNING}input error! Please only input number 4 10 11 and so on${CEND}"; echo
+        echo; echo "${CWARNING}input error! Please only input number 4 11 12 and so on${CEND}"; echo
         continue
       else
         [ -n "`echo ${array_phpext[@]} | grep -w 1`" ] && pecl_zendguardloader=1
@@ -655,12 +656,13 @@ if [ ${ARG_NUM} == 0 ]; then
         [ -n "`echo ${array_phpext[@]} | grep -w 7`" ] && pecl_imap=1
         [ -n "`echo ${array_phpext[@]} | grep -w 8`" ] && pecl_ldap=1
         [ -n "`echo ${array_phpext[@]} | grep -w 9`" ] && pecl_phalcon=1
-        [ -n "`echo ${array_phpext[@]} | grep -w 10`" ] && pecl_redis=1
-        [ -n "`echo ${array_phpext[@]} | grep -w 11`" ] && pecl_memcached=1
-        [ -n "`echo ${array_phpext[@]} | grep -w 12`" ] && pecl_memcache=1
-        [ -n "`echo ${array_phpext[@]} | grep -w 13`" ] && pecl_mongodb=1
-        [ -n "`echo ${array_phpext[@]} | grep -w 14`" ] && pecl_swoole=1
-        [ -n "`echo ${array_phpext[@]} | grep -w 15`" ] && pecl_xdebug=1
+        [ -n "`echo ${array_phpext[@]} | grep -w 10`" ] && pecl_yaf=1
+        [ -n "`echo ${array_phpext[@]} | grep -w 11`" ] && pecl_redis=1
+        [ -n "`echo ${array_phpext[@]} | grep -w 12`" ] && pecl_memcached=1
+        [ -n "`echo ${array_phpext[@]} | grep -w 13`" ] && pecl_memcache=1
+        [ -n "`echo ${array_phpext[@]} | grep -w 14`" ] && pecl_mongodb=1
+        [ -n "`echo ${array_phpext[@]} | grep -w 15`" ] && pecl_swoole=1
+        [ -n "`echo ${array_phpext[@]} | grep -w 16`" ] && pecl_xdebug=1
         break
       fi
     done
@@ -1148,8 +1150,8 @@ fi
 [ -d "${db_install_dir}/support-files" ] && [ -z "`ps -ef | grep mysqld_safe | grep -v grep`" ] && service mysqld start
 
 # reload php
-[ -e "${php_install_dir}/sbin/php-fpm" ] && service php-fpm reload
-[ -e "${php_install_dir}${mphp_ver}/sbin/php-fpm" ] && service php${mphp_ver}-fpm reload
+[ -e "${php_install_dir}/sbin/php-fpm" ] && { [ -e "/bin/systemctl" ] && systemctl reload php-fpm || service php-fpm reload; }
+[ -n "${mphp_ver}" -a -e "${php_install_dir}${mphp_ver}/sbin/php-fpm" ] && { [ -e "/bin/systemctl" ] && systemctl reload php${mphp_ver}-fpm || service php${mphp_ver}-fpm reload; }
 [ -e "${apache_install_dir}/bin/apachectl" ] && ${apache_install_dir}/bin/apachectl -k graceful
 
 endTime=`date +%s`

+ 1 - 1
uninstall.sh

@@ -730,7 +730,7 @@ else
     else
       [ "${php_flag}" == 'y' ] && Uninstall_PHP
       [ "${php_flag}" == 'y' ] && [ "${phpcache_flag}" == 'y' ] && Uninstall_PHPcache
-      [ "${php_flag}" == 'y' ] && [ -n "${php_extensions}" ] && Uninstall_PHPext
+      [ -n "${php_extensions}" ] && Uninstall_PHPext
       [ "${mphp_flag}" == 'y' ] && [ "${phpcache_flag}" != 'y' ] && [ -z "${php_extensions}" ] && Uninstall_MPHP
       [ "${mphp_flag}" == 'y' ] && [ "${phpcache_flag}" == 'y' ] && { php_install_dir=${php_install_dir}${mphp_ver}; Uninstall_PHPcache; }
       [ "${mphp_flag}" == 'y' ] && [ -n "${php_extensions}" ] && { php_install_dir=${php_install_dir}${mphp_ver}; Uninstall_PHPext; }

+ 3 - 3
versions.txt

@@ -3,8 +3,8 @@
 nginx_ver=1.14.2
 tengine_ver=2.2.3
 openresty_ver=1.13.6.2
-openssl11_ver=1.1.1a
-openssl_ver=1.0.2q
+openssl11_ver=1.1.1b
+openssl_ver=1.0.2r
 
 tomcat9_ver=9.0.16
 tomcat8_ver=8.5.38
@@ -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-29
+imagemagick_ver=6.9.10-32
 imagick_ver=3.4.3
 graphicsmagick_ver=1.3.30
 gmagick_ver=2.0.5RC1

+ 2 - 1
vhost.sh

@@ -565,7 +565,8 @@ Nginx_rewrite() {
     fi
     echo "You choose rewrite=${CMSG}$rewrite${CEND}"
     [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "joomla" ] && NGX_CONF=$(echo -e "location ~ \\.php\$ {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php${mphp_ver}-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n  }")
-    [ "${NGX_FLAG}" == 'php' ] && [[ "${rewrite}" =~ ^codeigniter$|^thinkphp$|^pathinfo$ ]] && NGX_CONF=$(echo -e "location ~ [^/]\.php(/|\$) {\n    try_files \$uri =404;\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php${mphp_ver}-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    set \$real_script_name \$fastcgi_script_name;\n    if (\$fastcgi_script_name ~ \"^(.+?\.php)(/.+)\$\") {\n      set \$real_script_name \$1;\n      set \$path_info \$2;\n    }\n    fastcgi_param SCRIPT_FILENAME \$document_root\$real_script_name;\n    fastcgi_param SCRIPT_NAME \$real_script_name;\n    fastcgi_param PATH_INFO \$path_info;\n  }")
+    #[ "${NGX_FLAG}" == 'php' ] && [[ "${rewrite}" =~ ^codeigniter$|^thinkphp$|^pathinfo$ ]] && NGX_CONF=$(echo -e "location ~ [^/]\.php(/|\$) {\n    try_files \$uri =404;\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php${mphp_ver}-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    set \$real_script_name \$fastcgi_script_name;\n    if (\$fastcgi_script_name ~ \"^(.+?\.php)(/.+)\$\") {\n      set \$real_script_name \$1;\n      set \$path_info \$2;\n    }\n    fastcgi_param SCRIPT_FILENAME \$document_root\$real_script_name;\n    fastcgi_param SCRIPT_NAME \$real_script_name;\n    fastcgi_param PATH_INFO \$path_info;\n  }")
+    [ "${NGX_FLAG}" == 'php' ] && [[ "${rewrite}" =~ ^codeigniter$|^thinkphp$|^pathinfo$ ]] && NGX_CONF=$(echo -e "location ~ [^/]\.php(/|\$) {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php${mphp_ver}-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    fastcgi_split_path_info ^(.+?\.php)(/.*)\$;\n    set \$path_info \$fastcgi_path_info;\n    fastcgi_param PATH_INFO \$path_info;\n    try_files \$fastcgi_script_name =404;    \n  }")
     [ "${NGX_FLAG}" == 'php' -a "${rewrite}" == "typecho" ] && NGX_CONF=$(echo -e "location ~ .*\.php(\/.*)*\$ {\n    #fastcgi_pass remote_php_ip:9000;\n    fastcgi_pass unix:/dev/shm/php${mphp_ver}-cgi.sock;\n    fastcgi_index index.php;\n    include fastcgi.conf;\n    set \$path_info \"\";\n    set \$real_script_name \$fastcgi_script_name;\n    if (\$fastcgi_script_name ~ \"^(.+?\.php)(/.+)\$\") {\n      set \$real_script_name \$1;\n      set \$path_info \$2;\n    }\n    fastcgi_param SCRIPT_FILENAME \$document_root\$real_script_name;\n    fastcgi_param SCRIPT_NAME \$real_script_name;\n    fastcgi_param PATH_INFO \$path_info;\n  }")
     if [[ ! "${rewrite}" =~ ^magento2$|^pathinfo$ ]]; then
       if [ -e "config/${rewrite}.conf" ]; then