Changes - j0ke.net Open Build Service

Changes of Revision 115

[-] [+]	Changed	nginx.spec
@@ -78,6 +78,7 @@ Source103: 50x.html Source104: 404.html Source105: modsecurity.conf +Source106: status.conf Source107: ngx_cache_purge-2.1.tar.gz Source108: modsecurity-apache_2.7.7.tar.gz @@ -96,6 +97,7 @@ Patch3: nginx-memset_zero.patch Patch4: tcp-proxymod.patch Patch7: nginx-1.3.9-upload.patch +Patch8: nginx_stats.patch %description Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3 @@ -115,6 +117,7 @@ * nginx-upstream-carp-read-only * nginx mod pagespeed * nginx mod security +* nginx extended status last but not least this package includes its own openssl @@ -129,6 +132,7 @@ %patch2 -p1 %patch4 -p1 #%patch5 -p1 +%patch8 -p1 %{__tar} zxvf %{SOURCE5} %{__tar} zxvf %{SOURCE9} @@ -249,6 +253,7 @@ %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir} %{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot} %{__install} -p -m 0644 %{SOURCE105} %{buildroot}%{nginx_confdir}/conf.d +%{__install} -p -m 0644 %{SOURCE106} %{buildroot}%{nginx_confdir}/conf.d %{__install} -p -m 0644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{buildroot}%{nginx_webroot} mv ngx_cache_purge-2.1/CHANGES ngx_cache_purge-2.1/CHANGES.ngx_cache_purge @@ -329,6 +334,11 @@ %changelog +* Mon Jul 16 2014 Juergen Gotteswinter <jg@internetx.de> - 1.7.1-ixevenbigger +- addded https://github.com/FastVPSEestiOu/nginx-extended-statistics-path +- bumped to 1.7.1 +- included its own openssl source tarball where the nginx got built against static + * Fri Apr 26 2014 Juergen Gotteswinter <jg@internetx.de> - 1.7.0-ixhuge1 - version bump to 1.7.0
[-] [+]	Added	nginx_stats.patch ^
@@ -0,0 +1,8349 @@ +diff -rupN nginx-1.7.1/auto/modules nginx-1.7.1-statpatch/auto/modules +--- nginx-1.7.1/auto/modules 2014-05-27 15:58:09.000000000 +0200 ++++ nginx-1.7.1-statpatch/auto/modules 2014-06-16 17:59:46.124122700 +0200 +@@ -392,6 +392,12 @@ if [ $HTTP_STUB_STATUS = YES ]; then + HTTP_SRCS="$HTTP_SRCS src/http/modules/ngx_http_stub_status_module.c" + fi + ++if [ $HTTP_FULL_STATUS = YES ]; then ++ have=NGX_FULL_STATUS . auto/have ++ HTTP_MODULES="$HTTP_MODULES ngx_http_full_status_module" ++ HTTP_SRCS="$HTTP_SRCS src/http/modules/ngx_http_full_status_module.c" ++fi ++ + #if [ -r $NGX_OBJS/auto ]; then + # . $NGX_OBJS/auto + #fi +diff -rupN nginx-1.7.1/auto/modules.orig nginx-1.7.1-statpatch/auto/modules.orig +--- nginx-1.7.1/auto/modules.orig 1970-01-01 01:00:00.000000000 +0100 ++++ nginx-1.7.1-statpatch/auto/modules.orig 2014-05-27 15:58:09.000000000 +0200 +@@ -0,0 +1,529 @@ ++ ++# Copyright (C) Igor Sysoev ++# Copyright (C) Nginx, Inc. ++ ++ ++if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then ++ EVENT_SELECT=YES ++fi ++ ++if [ $EVENT_SELECT = YES ]; then ++ have=NGX_HAVE_SELECT . auto/have ++ CORE_SRCS="$CORE_SRCS $SELECT_SRCS" ++ EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE" ++fi ++ ++ ++if [ $EVENT_POLL = NO -a $EVENT_FOUND = NO ]; then ++ EVENT_POLL=YES ++fi ++ ++if [ $EVENT_POLL = YES ]; then ++ have=NGX_HAVE_POLL . auto/have ++ CORE_SRCS="$CORE_SRCS $POLL_SRCS" ++ EVENT_MODULES="$EVENT_MODULES $POLL_MODULE" ++fi ++ ++ ++if [ $NGX_TEST_BUILD_DEVPOLL = YES ]; then ++ have=NGX_HAVE_DEVPOLL . auto/have ++ have=NGX_TEST_BUILD_DEVPOLL . auto/have ++ EVENT_MODULES="$EVENT_MODULES $DEVPOLL_MODULE" ++ CORE_SRCS="$CORE_SRCS $DEVPOLL_SRCS" ++fi ++ ++ ++if [ $NGX_TEST_BUILD_EVENTPORT = YES ]; then ++ have=NGX_HAVE_EVENTPORT . auto/have ++ have=NGX_TEST_BUILD_EVENTPORT . auto/have ++ EVENT_MODULES="$EVENT_MODULES $EVENTPORT_MODULE" ++ CORE_SRCS="$CORE_SRCS $EVENTPORT_SRCS" ++fi ++ ++if [ $NGX_TEST_BUILD_EPOLL = YES ]; then ++ have=NGX_HAVE_EPOLL . auto/have ++ have=NGX_HAVE_EPOLLRDHUP . auto/have ++ have=NGX_HAVE_EVENTFD . auto/have ++ have=NGX_TEST_BUILD_EPOLL . auto/have ++ EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE" ++ CORE_SRCS="$CORE_SRCS $EPOLL_SRCS" ++fi ++ ++if [ $NGX_TEST_BUILD_RTSIG = YES ]; then ++ have=NGX_HAVE_RTSIG . auto/have ++ have=NGX_TEST_BUILD_RTSIG . auto/have ++ EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE" ++ CORE_SRCS="$CORE_SRCS $RTSIG_SRCS" ++fi ++ ++if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then ++ have=NGX_TEST_BUILD_SOLARIS_SENDFILEV . auto/have ++ CORE_SRCS="$CORE_SRCS $SOLARIS_SENDFILEV_SRCS" ++fi ++ ++ ++if [ $HTTP != YES ]; then ++ have=NGX_CRYPT . auto/nohave ++ CRYPT_LIB= ++fi ++ ++ ++if [ $HTTP_CACHE = YES ]; then ++ USE_MD5=YES ++ have=NGX_HTTP_CACHE . auto/have ++ HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS" ++fi ++ ++ ++if [ $HTTP_SSI = YES ]; then ++ HTTP_POSTPONE=YES ++fi ++ ++ ++if [ $HTTP_ADDITION = YES ]; then ++ HTTP_POSTPONE=YES ++fi ++ ++ ++# the module order is important ++# ngx_http_static_module ++# ngx_http_gzip_static_module ++# ngx_http_dav_module ++# ngx_http_autoindex_module ++# ngx_http_index_module ++# ngx_http_random_index_module ++# ++# ngx_http_access_module ++# ngx_http_realip_module ++# ++# ++# the filter order is important ++# ngx_http_write_filter ++# ngx_http_header_filter ++# ngx_http_chunked_filter ++# ngx_http_spdy_filter ++# ngx_http_range_header_filter ++# ngx_http_gzip_filter ++# ngx_http_postpone_filter ++# ngx_http_ssi_filter ++# ngx_http_charset_filter ++# ngx_http_xslt_filter ++# ngx_http_image_filter ++# ngx_http_sub_filter ++# ngx_http_addition_filter ++# ngx_http_gunzip_filter ++# ngx_http_userid_filter ++# ngx_http_headers_filter ++# ngx_http_copy_filter ++# ngx_http_range_body_filter ++# ngx_http_not_modified_filter ++ ++HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \ ++ $HTTP_HEADER_FILTER_MODULE \ ++ $HTTP_CHUNKED_FILTER_MODULE" ++ ++if [ $HTTP_SPDY = YES ]; then ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SPDY_FILTER_MODULE" ++fi ++ ++HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_RANGE_HEADER_FILTER_MODULE" ++ ++if [ $HTTP_GZIP = YES ]; then ++ have=NGX_HTTP_GZIP . auto/have ++ USE_ZLIB=YES ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_GZIP_FILTER_MODULE" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_GZIP_SRCS" ++fi ++ ++if [ $HTTP_POSTPONE = YES ]; then ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS" ++fi ++ ++if [ $HTTP_SSI = YES ]; then ++ have=NGX_HTTP_SSI . auto/have ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE" ++ HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS" ++fi ++ ++if [ $HTTP_CHARSET = YES ]; then ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS" ++fi ++ ++if [ $HTTP_XSLT = YES ]; then ++ USE_LIBXSLT=YES ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS" ++fi ++ ++if [ $HTTP_IMAGE_FILTER = YES ]; then ++ USE_LIBGD=YES ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_IMAGE_FILTER_MODULE" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_IMAGE_SRCS" ++fi ++ ++if [ $HTTP_SUB = YES ]; then ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SUB_FILTER_MODULE" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_SUB_SRCS" ++fi ++ ++if [ $HTTP_ADDITION = YES ]; then ++ HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_ADDITION_FILTER_MODULE" ++ HTTP_SRCS="$HTTP_SRCS $HTTP_ADDITION_SRCS" ++fi ++ ++if [ $HTTP_GUNZIP = YES ]; then ++ have=NGX_HTTP_GZIP . auto/have ++ USE_ZLIB=YES
[-] [+]	Added	status.conf ^
@@ -0,0 +1,3 @@ +location /nginx_status { + full_status on; +}