Browse Source

Update Nginx 1.9.4 to 1.9.5

lj2007331 9 years ago
parent
commit
5618991a7c
4 changed files with 5 additions and 5 deletions
  1. 2 2
      apps.conf
  2. 1 1
      include/memory.sh
  3. 1 1
      include/nginx.sh
  4. 1 1
      include/upgrade_web.sh

+ 2 - 2
apps.conf

@@ -1,6 +1,6 @@
 # newest software version
 # Web
-nginx_version=1.9.4
+nginx_version=1.9.5
 tengine_version=2.1.1
 
 tomcat_7_version=7.0.64
@@ -63,7 +63,7 @@ memcache_pecl_version=2.2.7
 phpMyAdmin_version=4.4.15
 
 # jemalloc
-jemalloc_version=4.0.1
+jemalloc_version=4.0.2
 
 # tcmalloc
 tcmalloc_version=2.4

+ 1 - 1
include/memory.sh

@@ -39,7 +39,7 @@ Make-swapfile() {
     mkswap /swapfile
     swapon /swapfile
     chmod 600 /swapfile
-    [ -z "`grep swapfile /etc/fstab`"] && cat >> /etc/fstab << EOF
+    [ -z "`grep swapfile /etc/fstab`" ] && cat >> /etc/fstab << EOF
 /swapfile    swap    swap    defaults    0 0
 EOF
 

+ 1 - 1
include/nginx.sh

@@ -42,7 +42,7 @@ elif [ "$je_tc_malloc" == '2' ];then
 fi
 
 [ ! -d "$nginx_install_dir" ] && mkdir -p $nginx_install_dir
-./configure --prefix=$nginx_install_dir --user=$run_user --group=$run_user --with-http_stub_status_module --with-http_spdy_module --with-http_ssl_module --with-ipv6 --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module $malloc_module
+./configure --prefix=$nginx_install_dir --user=$run_user --group=$run_user --with-http_stub_status_module --with-http_v2_module --with-http_ssl_module --with-ipv6 --with-http_gzip_static_module --with-http_realip_module --with-http_flv_module $malloc_module
 make && make install
 if [ -e "$nginx_install_dir/conf/nginx.conf" ];then
     cd ..

+ 1 - 1
include/upgrade_web.sh

@@ -19,7 +19,7 @@ echo "Current Nginx Version: ${CMSG}$OLD_Nginx_version${CEND}"
 while :
 do
     echo
-    read -p "Please input upgrade Nginx Version(example: 1.9.5): " NEW_Nginx_version
+    read -p "Please input upgrade Nginx Version(example: 1.9.15): " NEW_Nginx_version
     if [ "$NEW_Nginx_version" != "$OLD_Nginx_version" ];then
         [ ! -e "nginx-$NEW_Nginx_version.tar.gz" ] && wget --no-check-certificate -c http://nginx.org/download/nginx-$NEW_Nginx_version.tar.gz > /dev/null 2>&1
         if [ -e "nginx-$NEW_Nginx_version.tar.gz" ];then