Update lnmp from OneinStack

linuxeye · Feb 17, 2019 · 119e83b · 119e83b
1 parent 5e30313
commit 119e83b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/include/check_download.sh b/include/check_download.sh
@@ -70,7 +70,6 @@ checkDownload() {
     1)
       echo "Download tomcat 9..."
       src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat9_ver}/apache-tomcat-${tomcat9_ver}.tar.gz && Download_src
-      src_url=http://mirrors.linuxeye.com/apache/tomcat/v${tomcat9_ver}/catalina-jmx-remote.jar && Download_src
       ;;
     2)
       echo "Download tomcat 8..."
@@ -116,6 +115,7 @@ checkDownload() {
 
   if [[ "${db_option}" =~ ^[1-9]$|^1[0-5]$ ]]; then
     if [[ "${db_option}" =~ ^[1,2,5,6,9]$|^10$ ]] && [ "${dbinstallmethod}" == "2" ]; then
+      [ "${db_option}" == '9' ] && boost_ver=1.67.0
       [[ "${db_option}" =~ ^[2,5,6]$|^10$ ]] && boost_ver=${boost_oldver}
       echo "Download boost..."
       [ "${IPADDR_COUNTRY}"x == "CN"x ] && DOWN_ADDR_BOOST=${mirrorLink} || DOWN_ADDR_BOOST=http://downloads.sourceforge.net/project/boost/boost/${boost_ver}

diff --git a/include/memory.sh b/include/memory.sh
@@ -39,6 +39,7 @@ fi
 
 # add swapfile
 if [ "${Swap}" == '0' ] && [ ${Mem} -le 2048 ]; then
+  echo "${CWARNING}Add Swap file, It may take a few minutes... ${CEND}"
   dd if=/dev/zero of=/swapfile count=2048 bs=1M
   mkswap /swapfile
   swapon /swapfile

diff --git a/include/mysql-8.0.sh b/include/mysql-8.0.sh
@@ -38,6 +38,7 @@ Install_MySQL80() {
     -DWITH_EMBEDDED_SERVER=1 \
     -DENABLE_DTRACE=0 \
     -DENABLED_LOCAL_INFILE=1 \
+    -DFORCE_INSOURCE_BUILD=1 \
     -DDEFAULT_CHARSET=utf8mb4 \
     -DEXTRA_CHARSETS=all
     make -j ${THREAD}

diff --git a/include/percona-8.0.sh b/include/percona-8.0.sh
@@ -23,6 +23,7 @@ Install_Percona80() {
     sed -i "s@/usr/local/Percona-Server-${percona80_ver}-Linux.${SYS_BIT_b}.${sslLibVer}@${percona_install_dir}@g" ${percona_install_dir}/bin/mysqld_safe
     sed -i 's@executing mysqld_safe@executing mysqld_safe\nexport LD_PRELOAD=/usr/local/lib/libjemalloc.so@' ${percona_install_dir}/bin/mysqld_safe
   elif [ "${dbinstallmethod}" == "2" ]; then
+    boost_ver=1.67.0
     boostVersion2=$(echo ${boost_ver} | awk -F. '{print $1"_"$2"_"$3}')
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf percona-server-${percona80_ver}.tar.gz

diff --git a/include/tomcat-9.sh b/include/tomcat-9.sh
@@ -35,7 +35,6 @@ Install_Tomcat9() {
     kill -9 $$
   fi
 
-  /bin/cp catalina-jmx-remote.jar ${tomcat_install_dir}/lib
   #[ ! -d "${tomcat_install_dir}/lib/catalina" ] && mkdir ${tomcat_install_dir}/lib/catalina
   #pushd ${tomcat_install_dir}/lib/catalina
   #jar xf ../catalina.jar

diff --git a/versions.txt b/versions.txt
@@ -7,7 +7,7 @@ openssl11_ver=1.1.1a
 openssl_ver=1.0.2q
 
 tomcat9_ver=9.0.16
-tomcat8_ver=8.5.37
+tomcat8_ver=8.5.38
 tomcat7_ver=7.0.92
 tomcat6_ver=6.0.53
 
@@ -36,7 +36,7 @@ percona55_ver=5.5.62-38.14
 
 alisql_ver=5.6.32-9
 
-pgsql_ver=11.1
+pgsql_ver=11.2
 
 mongodb_ver=4.0.6
 
@@ -70,7 +70,7 @@ gmagick_ver=2.0.5RC1
 gmagick_oldver=1.1.7RC3
 zendopcache_ver=7.0.5
 xcache_ver=3.2.0
-apcu_ver=5.1.16
+apcu_ver=5.1.17
 apcu_oldver=4.0.11
 eaccelerator_ver=0.9.6.1
 phalcon_ver=3.4.2
@@ -105,7 +105,7 @@ phpmyadmin_oldver=4.4.15.10
 jemalloc_ver=5.1.0
 
 # boost
-boost_ver=1.67.0
+boost_ver=1.68.0
 boost_oldver=1.59.0
 
 # Others
@@ -114,6 +114,6 @@ tmux_ver=2.8
 htop_ver=2.2.0
 bison_ver=2.7.1
 python_ver=3.6.8
-setuptools_ver=40.6.3
-pip_ver=18.1
+setuptools_ver=40.8.0
+pip_ver=19.0.2
 fail2ban_ver=0.10.4
diff --git a/vhost.sh b/vhost.sh
@@ -223,7 +223,7 @@ If you enter '.', the field will be left blank.
     read -e -p "Organizational Unit Name (eg, section) [IT Dept.]: " SELFSIGNEDSSL_OU
     SELFSIGNEDSSL_OU=${SELFSIGNEDSSL_OU:-"IT Dept."}
 
-    openssl req -new -newkey rsa:2048 -sha256 -nodes -out ${PATH_SSL}/${domain}.csr -keyout ${PATH_SSL}/${domain}.key -subj "/C=${SELFSIGNEDSSL_C}/ST=${SELFSIGNEDSSL_ST}/L=${SELFSIGNEDSSL_L}/O=${SELFSIGNEDSSL_O}/OU=${SELFSIGNEDSSL_OU}/CN=${domain}" > /dev/null 2>&1
+    openssl req -utf8 -new -newkey rsa:2048 -sha256 -nodes -out ${PATH_SSL}/${domain}.csr -keyout ${PATH_SSL}/${domain}.key -subj "/C=${SELFSIGNEDSSL_C}/ST=${SELFSIGNEDSSL_ST}/L=${SELFSIGNEDSSL_L}/O=${SELFSIGNEDSSL_O}/OU=${SELFSIGNEDSSL_OU}/CN=${domain}" > /dev/null 2>&1
     openssl x509 -req -days 36500 -sha256 -in ${PATH_SSL}/${domain}.csr -signkey ${PATH_SSL}/${domain}.key -out ${PATH_SSL}/${domain}.crt > /dev/null 2>&1
   elif [ "${Domian_Mode}" == '3' -o "${dnsapi_flag}" == 'y' ]; then
     if [ "${moredomain}" == "*.${domain}" -o "${dnsapi_flag}" == 'y' ]; then