Skip to content
Permalink
Browse files

add Openresty set-misc-nginx-module and ngx_devel_kit Nginx modules t…

  • Loading branch information...
centminmod committed May 7, 2015
1 parent 8abe156 commit b1006c5fd035235acdb4cd1e5969b4d144ef6033
Showing with 76 additions and 4 deletions.
  1. +3 −1 centmin.sh
  2. +8 −0 inc/downloadlinks.inc
  3. +56 −0 inc/downloads.inc
  4. +8 −2 inc/nginx_configure.inc
  5. +1 −1 inc/nginx_upgrade.inc
@@ -257,8 +257,10 @@ NGINX_STICKYVER='1.2.5'
NGINX_UPSTREAMCHECK='y' # nginx upstream check https://github.com/yaoweibin/nginx_upstream_check_module
NGINX_UPSTREAMCHECKVER='0.3.0'
NGINX_OPENRESTY='y' # Agentzh's openresty Nginx modules
ORESTY_MEMCVER='0.15' # openresty memc module https://github.com/openresty/memc-nginx-module
ORESTY_MEMCVER='0.15' # openresty memc module https://github.com/openresty/memc-nginx-module
ORESTY_SRCCACHEVER='0.28' # openresty subrequest cache module https://github.com/openresty/srcache-nginx-module
ORESTY_DEVELKITVER='0.2.19' # openresty ngx_devel_kit module https://github.com/simpl/ngx_devel_kit
ORESTY_SETMISCVER='0.28' # openresty set-misc-nginx module https://github.com/openresty/set-misc-nginx-module
PHP_INSTALL=y # Install PHP /w Fast Process Manager
PHPMAKETEST=n # set to y to enable make test after PHP make for diagnostic purposes

@@ -181,6 +181,14 @@ NGX_MEMCLINK="https://github.com/agentzh/memc-nginx-module/tarball/v${ORESTY_MEM
NGX_SRCACHELINKFILE="srcache-nginx-module_v${ORESTY_SRCCACHEVER}.tar.gz"
NGX_SRCACHELINK="https://github.com/agentzh/srcache-nginx-module/tarball/v${ORESTY_SRCCACHEVER}"

# wget renamed
NGX_DEVELKITLINKFILE="nginx-develkit_v${ORESTY_DEVELKITVER}.tar.gz"
NGX_DEVELKITLINK="https://github.com/simpl/ngx_devel_kit/archive/v${ORESTY_DEVELKITVER}.tar.gz"

# wget renamed
NGX_SETMISCLINKFILE="set-misc-nginx-module_v${ORESTY_SETMISCVER}.tar.gz"
NGX_SETMISCLINK="https://github.com/openresty/set-misc-nginx-module/archive/v${ORESTY_SETMISCVER}.tar.gz"

LIBEVENTLINKFILE="release-${LIBEVENT_VERSION}-stable.tar.gz"
LIBEVENTLINKOLD="https://github.com/downloads/libevent/libevent/${LIBEVENTLINKFILE}"
LIBEVENTLINK="https://github.com/libevent/libevent/archive/${LIBEVENTLINKFILE}"
@@ -512,6 +512,62 @@ else
cecho "${NGX_SRCACHELINKFILE} valid file." $boldyellow
echo ""
fi

cecho "Download ${NGX_DEVELKITLINKFILE} ..." $boldyellow
if [ -s ${NGX_DEVELKITLINKFILE} ]; then
cecho "${NGX_DEVELKITLINKFILE} Archive found, skipping download..." $boldgreen
else
cecho "Error: ${NGX_DEVELKITLINKFILE} not found!!!download now......"
wget -c --progress=bar --no-check-certificate ${NGX_DEVELKITLINK} -O ${NGX_DEVELKITLINKFILE} --tries=3
ERROR=$?
if [[ "$ERROR" != '0' ]]; then
cecho "Error: ${NGX_DEVELKITLINKFILE} download failed." $boldgreen
checklogdetails
exit #$ERROR
else
cecho "Download done." $boldyellow
#echo ""
fi
fi

tar xzf ${NGX_DEVELKITLINKFILE}
ERROR=$?
if [[ "$ERROR" != '0' ]]; then
cecho "Error: ${NGX_DEVELKITLINKFILE} extraction failed." $boldgreen
checklogdetails
exit #$ERROR
else
cecho "${NGX_DEVELKITLINKFILE} valid file." $boldyellow
echo ""
fi

cecho "Download ${NGX_SETMISCLINKFILE} ..." $boldyellow
if [ -s ${NGX_SETMISCLINKFILE} ]; then
cecho "${NGX_SETMISCLINKFILE} Archive found, skipping download..." $boldgreen
else
cecho "Error: ${NGX_SETMISCLINKFILE} not found!!!download now......"
wget -c --progress=bar --no-check-certificate ${NGX_SETMISCLINK} -O ${NGX_SETMISCLINKFILE} --tries=3
ERROR=$?
if [[ "$ERROR" != '0' ]]; then
cecho "Error: ${NGX_SETMISCLINKFILE} download failed." $boldgreen
checklogdetails
exit #$ERROR
else
cecho "Download done." $boldyellow
#echo ""
fi
fi

tar xzf ${NGX_SETMISCLINKFILE}
ERROR=$?
if [[ "$ERROR" != '0' ]]; then
cecho "Error: ${NGX_SETMISCLINKFILE} extraction failed." $boldgreen
checklogdetails
exit #$ERROR
else
cecho "${NGX_SETMISCLINKFILE} valid file." $boldyellow
echo ""
fi

fi # openresty
}
@@ -27,11 +27,17 @@ if [[ "$CENTOSVER" = '6.0' || "$CENTOSVER" = '6.1' || "$CENTOSVER" = '6.2' || "$
if [ "$NGINX_OPENRESTY" == 'y' ]; then
MEMCDIR=`ls -rt $DIR_TMP | grep openresty-memc-nginx-module | tail -1`
SRCACHEDIR=`ls -rt $DIR_TMP | grep openresty-srcache-nginx-module | tail -1`
SETMISCDIR=`ls -rt $DIR_TMP | grep set-misc-nginx-module | tail -1`
DEVELKITDIR=`ls -rt $DIR_TMP | grep ngx_devel_kit | tail -1`
MEMCOPT=" --add-module=../${MEMCDIR}"
SRCCACHEOPT=" --add-module=../${SRCACHEDIR}"
SETMISCOPT=" --add-module=../${SETMISCDIR}"
DEVELKITOPT=" --add-module=../${DEVELKITDIR}"
else
MEMCOPT=""
SRCCACHEOPT=""
SETMISCOPT=""
DEVELKITOPT=""
fi

if [[ "$NGINX_SPDY" = [yY] ]]; then
@@ -214,10 +220,10 @@ fi
# if [[ "$asknginxipv" = [yY] ]]; then
if [[ "$asknginxipv" = [yY] || "$NGINX_IPV" = [yY] ]]; then
pwd
./configure --sbin-path=/usr/local/sbin/nginx --conf-path=/usr/local/nginx/conf/nginx.conf --with-ipv6 --with-http_ssl_module --with-http_gzip_static_module --with-http_stub_status_module --with-http_sub_module --with-http_addition_module --with-http_image_filter_module --with-http_secure_link_module --with-http_flv_module --with-http_realip_module${GEOIPOPT} --with-openssl-opt="enable-tlsext" --add-module=../ngx-fancyindex-ngx-fancyindex --add-module=../ngx_cache_purge-${NGINX_CACHEPURGEVER} --add-module=../headers-more-nginx-module-${NGINX_HEADERSMORE} --add-module=../nginx-accesskey-2.0.3 --add-module=../nginx-http-concat-master${GPERFOPT}${WEBDAVOPT}${RUBYMODULE}${MEMCOPT}${SRCCACHEOPT}${STICKYOPT}${UPSTREAMOPT}${OPENSSLOPT}${LIBATOMICOPT}${STREAM}${PCREJITOPT}${SPDYOPT}${PGSPEEDOPT}
./configure --sbin-path=/usr/local/sbin/nginx --conf-path=/usr/local/nginx/conf/nginx.conf --with-ipv6 --with-http_ssl_module --with-http_gzip_static_module --with-http_stub_status_module --with-http_sub_module --with-http_addition_module --with-http_image_filter_module --with-http_secure_link_module --with-http_flv_module --with-http_realip_module${GEOIPOPT} --with-openssl-opt="enable-tlsext" --add-module=../ngx-fancyindex-ngx-fancyindex --add-module=../ngx_cache_purge-${NGINX_CACHEPURGEVER} --add-module=../headers-more-nginx-module-${NGINX_HEADERSMORE} --add-module=../nginx-accesskey-2.0.3 --add-module=../nginx-http-concat-master${GPERFOPT}${WEBDAVOPT}${RUBYMODULE}${MEMCOPT}${SRCCACHEOPT}${DEVELKITOPT}${SETMISCOPT}${STICKYOPT}${UPSTREAMOPT}${OPENSSLOPT}${LIBATOMICOPT}${STREAM}${PCREJITOPT}${SPDYOPT}${PGSPEEDOPT}
else
pwd
./configure --sbin-path=/usr/local/sbin/nginx --conf-path=/usr/local/nginx/conf/nginx.conf --with-http_ssl_module --with-http_gzip_static_module --with-http_stub_status_module --with-http_sub_module --with-http_addition_module --with-http_image_filter_module --with-http_secure_link_module --with-http_flv_module --with-http_realip_module${GEOIPOPT} --with-openssl-opt="enable-tlsext" --add-module=../ngx-fancyindex-ngx-fancyindex --add-module=../ngx_cache_purge-${NGINX_CACHEPURGEVER} --add-module=../headers-more-nginx-module-${NGINX_HEADERSMORE} --add-module=../nginx-accesskey-2.0.3 --add-module=../nginx-http-concat-master${GPERFOPT}${WEBDAVOPT}${RUBYMODULE}${MEMCOPT}${SRCCACHEOPT}${STICKYOPT}${UPSTREAMOPT}${OPENSSLOPT}${LIBATOMICOPT}${STREAM}${PCREJITOPT}${SPDYOPT}${PGSPEEDOPT}
./configure --sbin-path=/usr/local/sbin/nginx --conf-path=/usr/local/nginx/conf/nginx.conf --with-http_ssl_module --with-http_gzip_static_module --with-http_stub_status_module --with-http_sub_module --with-http_addition_module --with-http_image_filter_module --with-http_secure_link_module --with-http_flv_module --with-http_realip_module${GEOIPOPT} --with-openssl-opt="enable-tlsext" --add-module=../ngx-fancyindex-ngx-fancyindex --add-module=../ngx_cache_purge-${NGINX_CACHEPURGEVER} --add-module=../headers-more-nginx-module-${NGINX_HEADERSMORE} --add-module=../nginx-accesskey-2.0.3 --add-module=../nginx-http-concat-master${GPERFOPT}${WEBDAVOPT}${RUBYMODULE}${MEMCOPT}${SRCCACHEOPT}${DEVELKITOPT}${SETMISCOPT}${STICKYOPT}${UPSTREAMOPT}${OPENSSLOPT}${LIBATOMICOPT}${STREAM}${PCREJITOPT}${SPDYOPT}${PGSPEEDOPT}
fi

}
@@ -37,7 +37,7 @@ openssldownload
fi

if [ "$NGINX_OPENRESTY" == 'y' ]; then
if [[ ! -f "${DIR_TMP}/${NGX_MEMCLINKFILE}" || ! -f "${DIR_TMP}/${NGX_SRCACHELINKFILE}" ]]; then
if [[ ! -f "${DIR_TMP}/${NGX_MEMCLINKFILE}" || ! -f "${DIR_TMP}/${NGX_SRCACHELINKFILE}" || ! -f "${DIR_TMP}/${NGX_SETMISCLINKFILE}" || ! -f "${DIR_TMP}/${NGX_DEVELKITLINKFILE}" ]]; then
openrestytarball
fi
fi

0 comments on commit b1006c5

Please sign in to comment.
You can’t perform that action at this time.