Browse Source

Update apps.conf

lj2007331 9 years ago
parent
commit
9ef8ef5686
2 changed files with 21 additions and 19 deletions
  1. 3 3
      apps.conf
  2. 18 16
      install.sh

+ 3 - 3
apps.conf

@@ -19,7 +19,7 @@ mysql_5_version=5.5.45
 mariadb_10_version=10.0.21
 mariadb_5_version=5.5.45
 
-percona_6_version=5.6.25-73.1
+percona_6_version=5.6.26-74.0
 percona_5_version=5.5.45-37.4
 
 # JDK
@@ -32,7 +32,7 @@ php_3_version=5.3.29
 php_4_version=5.4.45
 php_5_version=5.5.29
 php_6_version=5.6.13
-php_7_version=7.0.0RC2
+php_7_version=7.0.0RC3
 
 zendopcache_version=7.0.5
 xcache_version=3.2.0
@@ -63,7 +63,7 @@ memcache_pecl_version=2.2.7
 phpMyAdmin_version=4.4.14.1
 
 # jemalloc
-jemalloc_version=4.0.0
+jemalloc_version=4.0.1
 
 # tcmalloc
 tcmalloc_version=2.4

+ 18 - 16
install.sh

@@ -53,23 +53,25 @@ mkdir -p $wwwroot_dir/default $wwwlogs_dir
 #done
 
 # Use default SSH port 22. If you use another SSH port on your server
-[ -z "`grep ^Port /etc/ssh/sshd_config`" ] && ssh_port=22 || ssh_port=`grep ^Port /etc/ssh/sshd_config | awk '{print $2}'`
-while :
-do
-    echo
-    read -p "Please input SSH port(Default: $ssh_port): " SSH_PORT 
-    [ -z "$SSH_PORT" ] && SSH_PORT=$ssh_port
-    if [ $SSH_PORT -eq 22 >/dev/null 2>&1 -o $SSH_PORT -gt 1024 >/dev/null 2>&1 -a $SSH_PORT -lt 65535 >/dev/null 2>&1 ];then
-        break
-    else
-        echo "${CWARNING}input error! Input range: 22,1025~65534${CEND}"
+if [ -e "/etc/ssh/sshd_config" ];then
+    [ -z "`grep ^Port /etc/ssh/sshd_config`" ] && ssh_port=22 || ssh_port=`grep ^Port /etc/ssh/sshd_config | awk '{print $2}'`
+    while :
+    do
+        echo
+        read -p "Please input SSH port(Default: $ssh_port): " SSH_PORT 
+        [ -z "$SSH_PORT" ] && SSH_PORT=$ssh_port
+        if [ $SSH_PORT -eq 22 >/dev/null 2>&1 -o $SSH_PORT -gt 1024 >/dev/null 2>&1 -a $SSH_PORT -lt 65535 >/dev/null 2>&1 ];then
+            break
+        else
+            echo "${CWARNING}input error! Input range: 22,1025~65534${CEND}"
+        fi
+    done
+    
+    if [ -z "`grep ^Port /etc/ssh/sshd_config`" -a "$SSH_PORT" != '22' ];then
+        sed -i "s@^#Port.*@&\nPort $SSH_PORT@" /etc/ssh/sshd_config
+    elif [ -n "`grep ^Port /etc/ssh/sshd_config`" ];then
+        sed -i "s@^Port.*@Port $SSH_PORT@" /etc/ssh/sshd_config 
     fi
-done
-
-if [ -z "`grep ^Port /etc/ssh/sshd_config`" -a "$SSH_PORT" != '22' ];then
-    sed -i "s@^#Port.*@&\nPort $SSH_PORT@" /etc/ssh/sshd_config
-elif [ -n "`grep ^Port /etc/ssh/sshd_config`" ];then
-    sed -i "s@^Port.*@Port $SSH_PORT@" /etc/ssh/sshd_config 
 fi
 
 # check Web server