fix openresty module support for Nginx upgrades

centminmod · Aug 1, 2014 · c5d7522 · c5d7522
1 parent 58af793
commit c5d7522
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/inc/nginx_configure.inc b/inc/nginx_configure.inc
@@ -25,8 +25,8 @@ if [[ "$CENTOSVER" = '6.0' || "$CENTOSVER" = '6.1' || "$CENTOSVER" = '6.2' || "$
 	fi
 
 	if [ "$NGINX_OPENRESTY" == 'y' ]; then
-		MEMCDIR=`ls -rt $DIR_TMP | grep openresty-memc-nginx-module`
-		SRCACHEDIR=`ls -rt $DIR_TMP | grep openresty-srcache-nginx-module`
+		MEMCDIR=`ls -rt $DIR_TMP | grep openresty-memc-nginx-module | tail -1`
+		SRCACHEDIR=`ls -rt $DIR_TMP | grep openresty-srcache-nginx-module | tail -1`
 		MEMCOPT=" --add-module=../${MEMCDIR}"
 		SRCCACHEOPT=" --add-module=../${SRCACHEDIR}"
 	else

diff --git a/inc/nginx_upgrade.inc b/inc/nginx_upgrade.inc
@@ -263,11 +263,7 @@ then
 
 fi
 
-if [ "$NGINX_OPENRESTY" == 'y' ]; then
-funct_nginxmodules_openresty
-else
 funct_nginxmodules
-fi
 
     # Install nginx
     cd $DIR_TMP