Update versions.txt

include/apache-2.4.sh

@@ -22,16 +22,6 @@ Install_Apache24() {
   tar xzf apr-${apr_version}.tar.gz
   tar xzf apr-util-${apr_util_version}.tar.gz
 
-  # install openssl-1.0.2
-  if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
-    tar xzf openssl-${openssl_version}.tar.gz
-    pushd openssl-${openssl_version}
-    ./config --prefix=${openssl_install_dir} -fPIC shared zlib
-    make -j ${THREAD} && make install
-    popd
-    rm -rf openssl-${openssl_version}
-  fi
-
   # install nghttp2
   if [ ! -e "/usr/local/lib/libnghttp2.so" ]; then
     pushd nghttp2-${nghttp2_version}

include/check_download.sh

@@ -493,7 +493,7 @@ checkDownload() {
         src_url=${mirrorLink}/php5.3patch && Download_src
         # Use the special ssl for php5.3
         if [ "${Debian_version}" == '8' -o "${Ubuntu_version}" == "16" ]; then
-          if [ ! -e "/usr/local/openssl/lib/libcrypto.a" ]; then
+          if [ ! -e "/usr/local/openssl100s/lib/libcrypto.a" ]; then
             src_url=${mirrorLink}/openssl-1.0.0s.tar.gz && Download_src
             src_url=${mirrorLink}/curl-7.35.0.tar.gz && Download_src
           fi

include/check_sw.sh

@@ -141,6 +141,7 @@ installDepsBySrc() {
       pushd tmux-${tmux_version}
       CFLAGS="-I/usr/local/include" LDFLAGS="-L//usr/local/lib" ./configure
       make -j ${THREAD} && make install
+      unset LDFLAGS
       popd
       rm -rf tmux-${tmux_version}
 

include/jemalloc.sh

@@ -9,25 +9,28 @@
 #       https://github.com/lj2007331/oneinstack
 
 Install_Jemalloc() {
-  pushd ${oneinstack_dir}/src
-  tar xjf jemalloc-$jemalloc_version.tar.bz2
-  pushd jemalloc-$jemalloc_version
-  LDFLAGS="${LDFLAGS} -lrt" ./configure
-  make -j ${THREAD} && make install
-  popd
-  if [ -f "/usr/local/lib/libjemalloc.so" ]; then
-    if [ "$OS_BIT" == '64' -a "$OS" == 'CentOS' ]; then
-      ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib64/libjemalloc.so.1
+  if [ ! -e "/usr/local/lib/libjemalloc.so" ]; then
+    pushd ${oneinstack_dir}/src
+    tar xjf jemalloc-$jemalloc_version.tar.bz2
+    pushd jemalloc-$jemalloc_version
+    LDFLAGS="${LDFLAGS} -lrt" ./configure
+    make -j ${THREAD} && make install
+    unset LDFLAGS
+    popd
+    if [ -f "/usr/local/lib/libjemalloc.so" ]; then
+      if [ "$OS_BIT" == '64' -a "$OS" == 'CentOS' ]; then
+        ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib64/libjemalloc.so.1
+      else
+        ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib/libjemalloc.so.1
+      fi
+      echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
+      ldconfig
+      echo "${CSUCCESS}jemalloc module installed successfully! ${CEND}"
+      rm -rf jemalloc-${jemalloc_version}
     else
-      ln -s /usr/local/lib/libjemalloc.so.2 /usr/lib/libjemalloc.so.1
+      echo "${CFAILURE}jemalloc install failed, Please contact the author! ${CEND}"
+      kill -9 $$
     fi
-    echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
-    ldconfig
-    echo "${CSUCCESS}jemalloc module installed successfully! ${CEND}"
-    rm -rf jemalloc-${jemalloc_version}
-  else
-    echo "${CFAILURE}jemalloc install failed, Please contact the author! ${CEND}"
-    kill -9 $$
+    popd
   fi
-  popd
 }

include/mysql-5.5.sh

@@ -21,6 +21,7 @@ Install_MySQL55() {
     tar xvf mysql-${mysql55_version}-linux2.6-${SYS_BIT_b}.tar.gz
     mv mysql-${mysql55_version}-linux2.6-${SYS_BIT_b}/* ${mysql_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf mysql-${mysql55_version}.tar.gz
     pushd mysql-${mysql55_version}

include/mysql-5.6.sh

@@ -21,6 +21,7 @@ Install_MySQL56() {
     tar xvf mysql-${mysql56_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
     mv mysql-${mysql56_version}-linux-glibc2.5-${SYS_BIT_b}/* ${mysql_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf mysql-${mysql56_version}.tar.gz
     pushd mysql-${mysql56_version}

include/mysql-5.7.sh

@@ -21,6 +21,7 @@ Install_MySQL57() {
     tar xvf mysql-${mysql57_version}-linux-glibc2.5-${SYS_BIT_b}.tar.gz
     mv mysql-${mysql57_version}-linux-glibc2.5-${SYS_BIT_b}/* ${mysql_install_dir}
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${mysql_install_dir}/bin/mysqld_safe
+    sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
   elif [ "${dbInstallMethods}" == "2" ]; then
     tar xvf mysql-${mysql57_version}.tar.gz
     pushd mysql-${mysql57_version}

include/openssl.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# Author:  yeho <lj2007331 AT gmail.com>
+# BLOG:  https://blog.linuxeye.com
+#
+# Notes: OneinStack for CentOS/RadHat 5+ Debian 6+ and Ubuntu 12+
+#
+# Project home page:
+#       https://oneinstack.com
+#       https://github.com/lj2007331/oneinstack
+
+Install_openSSL102() {
+  if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
+    # install openssl-1.0.2
+    pushd ${oneinstack_dir}/src
+    tar xzf openssl-${openssl_version}.tar.gz
+    pushd openssl-${openssl_version}
+    ./config --prefix=${openssl_install_dir} -fPIC shared zlib-dynamic
+    make -j ${THREAD} && make install
+    popd;popd
+    if [ -f "${openssl_install_dir}/lib/libcrypto.a" ]; then
+      echo "${CSUCCESS}openssl-1.0.2 module installed successfully! ${CEND}"
+      rm -rf openssl-${openssl_version}
+    else
+      echo "${CFAILURE}openssl-1.0.2 install failed, Please contact the author! ${CEND}"
+      kill -9 $$
+    fi
+  fi
+}
+
+Install_openSSL100() {
+  if [ ! -e '/usr/local/openssl100s/lib/libcrypto.a' ]; then
+    pushd ${oneinstack_dir}/src
+    tar xzf openssl-1.0.0s.tar.gz
+    pushd openssl-1.0.0s
+    ./config --prefix=/usr/local/openssl100s -fPIC shared zlib-dynamic
+    make -j ${THREAD} && make install
+    popd;popd
+    if [ -f "/usr/local/openssl100s/lib/libcrypto.a" ]; then
+      echo "${CSUCCESS}openssl-1.0.0s module installed successfully! ${CEND}"
+      rm -rf openssl-1.0.0s
+    else
+      echo "${CFAILURE}openssl-1.0.0s install failed, Please contact the author! ${CEND}"
+      kill -9 $$
+    fi
+  fi
+}

include/php-5.3.sh

@@ -21,14 +21,6 @@ Install_PHP53() {
   
   # Problem building php-5.3 with openssl
   if [ "$Debian_version" == '8' -o "$Ubuntu_version" == '16' ]; then
-    if [ ! -e '/usr/local/openssl100s/lib/libcrypto.a' ]; then
-      tar xzf openssl-1.0.0s.tar.gz
-      pushd openssl-1.0.0s
-      CFLAGS=-fPIC ./config --prefix=/usr/local/openssl100s shared zlib-dynamic 
-      make -j ${THREAD} && make install
-      popd 
-      rm -rf openssl-1.0.0s
-    fi
     OpenSSL_args='--with-openssl=/usr/local/openssl100s'
   else
     OpenSSL_args='--with-openssl'

include/tomcat-6.sh

@@ -15,16 +15,6 @@ Install_Tomcat6() {
   id -u ${run_user} >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /bin/bash ${run_user} || { [ -z "$(grep ^${run_user} /etc/passwd | grep '/bin/bash')" ] && usermod -s /bin/bash ${run_user}; }
 
-  # install openssl-1.0.2
-  if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
-    tar xzf openssl-${openssl_version}.tar.gz
-    pushd openssl-${openssl_version}
-    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib-dynamic 
-    make -j ${THREAD} && make install
-    popd
-    rm -rf openssl-${openssl_version}
-  fi
-
   # install apr
   if [ ! -e "/usr/local/apr/bin/apr-1-config" ]; then
     tar xzf apr-${apr_version}.tar.gz

include/tomcat-7.sh

@@ -15,16 +15,6 @@ Install_Tomcat7() {
   id -u ${run_user} >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /bin/bash ${run_user} || { [ -z "$(grep ^${run_user} /etc/passwd | grep '/bin/bash')" ] && usermod -s /bin/bash ${run_user}; }
 
-  # install openssl-1.0.2
-  if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
-    tar xzf openssl-${openssl_version}.tar.gz
-    pushd openssl-${openssl_version}
-    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib-dynamic 
-    make -j ${THREAD} && make install
-    popd
-    rm -rf openssl-${openssl_version}
-  fi
-
   # install apr
   if [ ! -e "/usr/local/apr/bin/apr-1-config" ]; then
     tar xzf apr-${apr_version}.tar.gz

include/tomcat-8.sh

@@ -15,16 +15,6 @@ Install_Tomcat8() {
   id -u ${run_user} >/dev/null 2>&1
   [ $? -ne 0 ] && useradd -M -s /bin/bash ${run_user} || { [ -z "$(grep ^${run_user} /etc/passwd | grep '/bin/bash')" ] && usermod -s /bin/bash ${run_user}; }
 
-  # install openssl-1.0.2
-  if [ ! -e "${openssl_install_dir}/lib/libcrypto.a" ]; then
-    tar xzf openssl-${openssl_version}.tar.gz
-    pushd openssl-${openssl_version}
-    CFLAGS=-fPIC ./config --prefix=${openssl_install_dir} shared zlib-dynamic 
-    make -j ${THREAD} && make install
-    popd
-    rm -rf openssl-${openssl_version}
-  fi
-
   # install apr
   if [ ! -e "/usr/local/apr/bin/apr-1-config" ]; then
     tar xzf apr-${apr_version}.tar.gz

include/upgrade_db.sh

@@ -165,6 +165,7 @@ Upgrade_DB() {
       mkdir -p $mysql_data_dir;chown mysql.mysql -R $mysql_data_dir
       mv $DB_name/* $mysql_install_dir/
       sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' $mysql_install_dir/bin/mysqld_safe
+      sed -i "s@/usr/local/mysql@${mysql_install_dir}@g" ${mysql_install_dir}/bin/mysqld_safe
       [ "`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`" != '5.7' ] && $mysql_install_dir/scripts/mysql_install_db --user=mysql --basedir=$mysql_install_dir --datadir=$mysql_data_dir
       [ "`echo $NEW_DB_version | awk -F. '{print $1"."$2}'`" == '5.7' ] && $mysql_install_dir/bin/mysqld --initialize-insecure --user=mysql --basedir=$mysql_install_dir --datadir=$mysql_data_dir
 

install.sh

@@ -486,12 +486,20 @@ checkDownload 2>&1 | tee -a ${oneinstack_dir}/install.log
 # Install dependencies from source package
 installDepsBySrc 2>&1 | tee -a ${oneinstack_dir}/install.log
 
-# jemalloc
+# Jemalloc
 if [[ $Nginx_version =~ ^[1-3]$ ]] || [ "$DB_yn" == 'y' -a "$DB_version" != '10' ]; then
-  if [ ! -e "/usr/local/lib/libjemalloc.so" ]; then
-    . include/jemalloc.sh
-    Install_Jemalloc | tee -a $oneinstack_dir/install.log
-  fi
+  . include/jemalloc.sh
+  Install_Jemalloc | tee -a $oneinstack_dir/install.log
+fi
+
+# openSSL 
+. ./include/openssl.sh
+if [ "$Debian_version" == '8' -o "$Ubuntu_version" == '16' ] && [ "$PHP_version" == '1' ]; then
+  # Problem building php-5.3 with openssl
+  Install_openSSL100 | tee -a $oneinstack_dir/install.log
+fi
+if [[ $Tomcat_version =~ ^[1-3]$ ]] || [ "$DB_yn" == 'y' -a "$Apache_version" == '1' ]; then
+  Install_openSSL102 | tee -a $oneinstack_dir/install.log
 fi
 
 # Database

uninstall.sh

@@ -75,6 +75,7 @@ Print_web() {
   [ -e "/etc/logrotate.d/tomcat" ] && echo "/etc/logrotate.d/tomcat"
   [ -d "/usr/java" ] && echo '/usr/java'
   [ -d "/usr/local/apr" ] && echo '/usr/local/apr'
+  [ -d "${openssl_install_dir}" ] && echo "${openssl_install_dir}"
 }
 
 Uninstall_Web() {
@@ -84,6 +85,7 @@ Uninstall_Web() {
   [ -d "${apache_install_dir}" ] && { service httpd stop > /dev/null 2>&1; rm -rf ${apache_install_dir} /etc/init.d/httpd /etc/logrotate.d/apache; sed -i "s@${apache_install_dir}/bin:@@" /etc/profile; }
   [ -d "${tomcat_install_dir}" ] && { killall java > /dev/null 2>&1; chmod +x /etc/logrotate.d/tomcat; rm -rf ${tomcat_install_dir} /etc/init.d/tomcat /etc/logrotate.d/tomcat /usr/local/apr; }
   [ -d "/usr/java" ] && { rm -rf /usr/java; sed -i '/export JAVA_HOME=/d' /etc/profile; sed -i '/export CLASSPATH=/d' /etc/profile; sed -i 's@\$JAVA_HOME/bin:@@' /etc/profile; }
+  [ -d "${openssl_install_dir}" ] && rm -rf ${openssl_install_dir}
   [ -e "${wwwroot_dir}" ] && /bin/mv ${wwwroot_dir}{,$(date +%Y%m%d%H)}
   sed -i 's@^website_name=.*@website_name=@' ./options.conf
   sed -i 's@^local_bankup_yn=.*@local_bankup_yn=y@' ./options.conf
@@ -111,6 +113,7 @@ Print_PHP() {
   [ -e "/etc/init.d/php-fpm" ] && echo "/etc/init.d/php-fpm"
   [ -e "/usr/local/imagemagick" ] && echo "/usr/local/imagemagick"
   [ -e "/usr/local/graphicsmagick" ] && echo '/usr/local/graphicsmagick'
+  [ -e "/usr/local/openssl100s" ] && echo '/usr/local/openssl100s'
 }
 
 Uninstall_PHP() {
@@ -118,6 +121,7 @@ Uninstall_PHP() {
   [ -e "${php_install_dir}/bin/phpize" -a ! -e "${php_install_dir}/etc/php-fpm.conf" ] && rm -rf ${php_install_dir}
   [ -e "/usr/local/imagemagick" ] && rm -rf /usr/local/imagemagick
   [ -e "/usr/local/graphicsmagick" ] && rm -rf /usr/local/graphicsmagick
+  [ -e "/usr/local/openssl100s" ] && rm -rf /usr/local/openssl100s 
   sed -i "s@${php_install_dir}/bin:@@" /etc/profile
   echo "${CMSG}PHP uninstall completed${CEND}"
 }

versions.txt

@@ -26,7 +26,7 @@ mariadb100_version=10.0.29
 mariadb55_version=5.5.54
 
 percona57_version=5.7.17-11
-percona56_version=5.6.34-79.1
+percona56_version=5.6.35-80.0
 percona55_version=5.5.54-38.6
 
 alisql56_version=5.6.32-3
@@ -37,8 +37,8 @@ jdk17_version=1.7.0_80
 jdk16_version=1.6.0_45
 
 # PHP
-php71_version=7.1.1
-php70_version=7.0.15
+php71_version=7.1.2
+php70_version=7.0.16
 php56_version=5.6.30
 php55_version=5.5.38
 php54_version=5.4.45
@@ -47,7 +47,7 @@ php53_version=5.3.29
 zendopcache_version=7.0.5
 xcache_version=3.2.0
 apcu_version=4.0.11
-apcu_for_php7_version=5.1.7
+apcu_for_php7_version=5.1.8
 ImageMagick_version=6.9.7-6
 imagick_version=3.4.3
 imagick_for_php53_version=3.3.0
@@ -65,7 +65,7 @@ eaccelerator_version=0.9.6.1
 pureftpd_version=1.0.45
 
 # Redis
-redis_version=3.2.6
+redis_version=3.2.8
 redis_pecl_for_php7_version=3.1.1
 redis_pecl_version=2.2.8
 

vhost.sh

@@ -243,7 +243,7 @@ EOF
           Cron_Command="/etc/init.d/httpd graceful"
         fi
         [ "${OS}" == "CentOS" ] && Cron_file=/var/spool/cron/root || Cron_file=/var/spool/cron/crontabs/root
-        [ -z "$(grep 'certbot renew' ${Cron_file})" ] && echo "0 0 1 * * ${python_install_dir}/bin/certbot renew --renew-hook \"${Cron_Command}\"" >> $Cron_file
+        [ -z "$(grep 'certbot renew' ${Cron_file})" ] && echo "30 2 * * 1 ${python_install_dir}/bin/certbot renew --renew-hook \"${Cron_Command}\"" >> $Cron_file
       else
         echo "${CFAILURE}Error: Let's Encrypt SSL certificate installation failed! ${CEND}"
         exit 1