|
[-]
[+]
|
Deleted |
nginx.spec
|
| @@ -1,299 +0,0 @@
-%define nginx_user nginx
-%define nginx_group %{nginx_user}
-%define nginx_home %{_localstatedir}/lib/nginx
-%define nginx_home_tmp %{nginx_home}/tmp
-%define nginx_logdir %{_localstatedir}/log/nginx
-%define nginx_confdir %{_sysconfdir}/nginx
-%define nginx_datadir %{_datadir}/nginx
-%define nginx_webroot %{nginx_datadir}/html
-%define rtmp_ext nginx-rtmp-module
-%define rtmp_ext_version 1.1.5
-%define rtmp %{rtmp_ext}-%{rtmp_ext_version}
-%define rtmp_nover %{rtmp_ext}
-%define with_rtmp_ext 1
-%define sticky_module_version 1.2.5
-%define sticky_module_srcdir nginx-goodies-nginx-sticky-module-ng-bd312d586752
-
-Name: nginx
-Version: 1.6.2
-Release: 1
-Summary: Robust, small and high performance http and reverse proxy server
-Group: System Environment/Daemons
-
-License: BSD
-URL: http://nginx.net/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl(ExtUtils::Embed)
-Requires: pcre,zlib,openssl
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires(pre): shadow-utils
-Requires(post): chkconfig
-Requires(preun): chkconfig, initscripts
-Requires(postun): initscripts
-
-Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.bz2
-Source1: %{name}.init
-Source2: %{name}.logrotate
-Source3: virtual.conf
-Source4: ssl.conf
-Source5: nginx-upstream-fair.tgz
-Source6: upstream-fair.conf
-Source7: %{name}.sysconfig
-Source8: ngx_slowfs_cache-1.5.tar.gz
-Source9: Nginx-limit-traffic-rate-module.tar.gz
-Source10: %{rtmp}.tar.bz2
-Source11: nginx_upstream_check_module-master.tar.gz
-Source12: nginx-sticky-module-ng-%{sticky_module_version}.tar.gz
-Source100: index.html
-Source101: poweredby.png
-Source102: nginx-logo.png
-Source103: 50x.html
-Source104: 404.html
-
-# removes -Werror in upstream build scripts. -Werror conflicts with
-# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
-Patch0: nginx-auto-cc-gcc.patch
-
-# configuration patch to match all the Fedora paths for logs, pid files
-# etc.
-Patch1: nginx-conf-0.7.x.patch
-#Patch2: check_1.2.6+.patch
-
-# syslog patch, use syslog instead of nginx logfiles
-#Patch2: nginx-syslog.patch
-#Patch3: nginx-unix-sockets.diff
-#Patch4: nginx-versiontilt.patch
-
-%description
-Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
-proxy server written by Igor Sysoev.
-
-One third party module, nginx-upstream-fair, has been added.
-
-%prep
-%setup -q
-
-%patch0 -p0
-%patch1 -p0
-# %patch2 -p1
-# %patch3 -p1
-#%patch4 -p1
-%{__tar} zxvf %{SOURCE5}
-%{__tar} zxvf %{SOURCE9}
-%{__tar} jxvf %{SOURCE10}
-%{__tar} zxvf %{SOURCE11}
-%{__tar} xxvf %{SOURCE12}
-
-%build
-export DESTDIR=%{buildroot}
-./configure \
- --user=%{nginx_user} \
- --group=%{nginx_group} \
- --prefix=%{nginx_datadir} \
- --sbin-path=%{_sbindir}/%{name} \
- --conf-path=%{nginx_confdir}/%{name}.conf \
- --error-log-path=%{nginx_logdir}/error.log \
- --http-log-path=%{nginx_logdir}/access.log \
- --http-client-body-temp-path=%{nginx_home_tmp}/client_body \
- --http-proxy-temp-path=%{nginx_home_tmp}/proxy \
- --http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
- --pid-path=%{_localstatedir}/run/%{name}.pid \
- --lock-path=%{_localstatedir}/lock/subsys/%{name} \
- --with-http_ssl_module \
- --with-http_realip_module \
- --with-http_addition_module \
- --with-http_sub_module \
- --with-http_dav_module \
- --with-http_flv_module \
- --with-http_gzip_static_module \
- --with-http_stub_status_module \
- --with-http_mp4_module \
- --with-mail \
- --with-mail_ssl_module \
- --with-debug \
- --with-ipv6 \
- --with-http_spdy_module \
- --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
- --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair \
- --add-module=%{_builddir}/nginx-%{version}/nginx_upstream_check_module-master \
- --add-module=%{_builddir}/nginx-%{version}/%{sticky_module_srcdir} \
-%if 0%{with_rtmp_ext}
- --add-module=%{_builddir}/nginx-%{version}/%{rtmp} \
-%endif
- --add-module=%{_builddir}/nginx-%{version}/Nginx-limit-traffic-rate-module
-%if 0%{?fedora_version} > 10
- --with-file-aio
-%endif
-
-make %{?_smp_mflags}
-
-mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALLDIRS=vendor
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -type f -name perllocal.pod -exec rm -f {} \;
-find %{buildroot} -type f -empty -exec rm -f {} \;
-find %{buildroot} -type f -exec chmod 0644 {} \;
-find %{buildroot} -type f -name '*.so' -exec chmod 0755 {} \;
-chmod 0755 %{buildroot}%{_sbindir}/nginx
-%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
-%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE6} %{buildroot}%{nginx_confdir}/conf.d
-%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
-%{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
-%{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}
-%{__install} -p -m 0644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{buildroot}%{nginx_webroot}
-
-# convert to UTF-8 all files that give warnings.
-for textfile in CHANGES
-do
- mv $textfile $textfile.old
- iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
- rm -f $textfile.old
-done
-
-%clean
-rm -rf %{buildroot}
-
-%pre
-%{_sbindir}/useradd -c "Nginx user" -s /bin/false -r -d %{nginx_home} %{nginx_user} 2>/dev/null || :
-
-%post
-/sbin/chkconfig --add %{name}
-
-%preun
-if [ $1 = 0 ]; then
- /sbin/service %{name} stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}
-fi
-
-%postun
-if [ $1 -ge 1 ]; then
- /sbin/service %{name} condrestart > /dev/null 2>&1 || :
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE CHANGES README nginx-upstream-fair/README.nginx-upstream-fair
-%{nginx_datadir}/
-%{_sbindir}/%{name}
-# %{_mandir}/man3/%{name}.3pm.gz
-%{_initrddir}/%{name}
-%dir %{nginx_confdir}
-%dir %{nginx_confdir}/conf.d
-%config(noreplace) %{nginx_confdir}/conf.d/*.conf
-%config(noreplace) %{nginx_confdir}/win-utf
-%config(noreplace) %{nginx_confdir}/%{name}.conf.default
-%config(noreplace) %{nginx_confdir}/mime.types.default
-%config(noreplace) %{nginx_confdir}/fastcgi_params
-%config(noreplace) %{nginx_confdir}/fastcgi_params.default
-%config(noreplace) %{nginx_confdir}/fastcgi.conf
-%config(noreplace) %{nginx_confdir}/fastcgi.conf.default
-%config(noreplace) %{nginx_confdir}/scgi_params
-%config(noreplace) %{nginx_confdir}/scgi_params.default
-%config(noreplace) %{nginx_confdir}/uwsgi_params
|
|
[-]
[+]
|
Deleted |
check_1.2.6+.patch
^
|
| @@ -1,209 +0,0 @@
-diff --git a/src/http/modules/ngx_http_upstream_ip_hash_module.c b/src/http/modules/ngx_http_upstream_ip_hash_module.c
-index 89ccc2b..a552044 100644
---- a/src/http/modules/ngx_http_upstream_ip_hash_module.c
-+++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c
-@@ -9,6 +9,10 @@
- #include <ngx_core.h>
- #include <ngx_http.h>
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
-+
-
- typedef struct {
- /* the round robin data must be first */
-@@ -208,6 +212,12 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
-
- if (!peer->down) {
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+ "get ip_hash peer, check_index: %ui",
-+ peer->check_index);
-+ if (!ngx_http_check_peer_down(peer->check_index)) {
-+#endif
- if (peer->max_fails == 0 || peer->fails < peer->max_fails) {
- break;
- }
-@@ -216,6 +226,9 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
- peer->checked = now;
- break;
- }
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ }
-+#endif
- }
-
- iphp->rrp.tried[n] |= m;
-diff --git a/src/http/modules/ngx_http_upstream_least_conn_module.c b/src/http/modules/ngx_http_upstream_least_conn_module.c
-index 21156ae..c57393d 100644
---- a/src/http/modules/ngx_http_upstream_least_conn_module.c
-+++ b/src/http/modules/ngx_http_upstream_least_conn_module.c
-@@ -9,6 +9,10 @@
- #include <ngx_core.h>
- #include <ngx_http.h>
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
-+
-
- typedef struct {
- ngx_uint_t *conns;
-@@ -203,6 +207,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
- continue;
- }
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+ "get least_conn peer, check_index: %ui",
-+ peer->check_index);
-+
-+ if (ngx_http_check_peer_down(peer->check_index)) {
-+ continue;
-+ }
-+#endif
-+
- if (peer->max_fails
- && peer->fails >= peer->max_fails
- && now - peer->checked <= peer->fail_timeout)
-@@ -256,6 +270,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
- continue;
- }
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+ "get least_conn peer, check_index: %ui",
-+ peer->check_index);
-+
-+ if (ngx_http_check_peer_down(peer->check_index)) {
-+ continue;
-+ }
-+#endif
-+
- if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) {
- continue;
- }
-diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
-index 4b78cff..f077b46 100644
---- a/src/http/ngx_http_upstream_round_robin.c
-+++ b/src/http/ngx_http_upstream_round_robin.c
-@@ -9,6 +9,9 @@
- #include <ngx_core.h>
- #include <ngx_http.h>
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
-
- static ngx_int_t ngx_http_upstream_cmp_servers(const void *one,
- const void *two);
-@@ -87,7 +90,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- peers->peer[n].weight = server[i].weight;
- peers->peer[n].effective_weight = server[i].weight;
- peers->peer[n].current_weight = 0;
-- n++;
-+
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ if (!server[i].down) {
-+ peers->peer[n].check_index =
-+ ngx_http_check_add_peer(cf, us, &server[i].addrs[j]);
-+ }
-+ else {
-+ peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
-+ }
-+#endif
-+ n++;
- }
- }
-
-@@ -145,6 +158,17 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- backup->peer[n].max_fails = server[i].max_fails;
- backup->peer[n].fail_timeout = server[i].fail_timeout;
- backup->peer[n].down = server[i].down;
-+
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ if (!server[i].down) {
-+ backup->peer[n].check_index =
-+ ngx_http_check_add_peer(cf, us, &server[i].addrs[j]);
-+ }
-+ else {
-+ backup->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
-+ }
-+#endif
-+
- n++;
- }
- }
-@@ -206,6 +230,9 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- peers->peer[i].current_weight = 0;
- peers->peer[i].max_fails = 1;
- peers->peer[i].fail_timeout = 10;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR;
-+#endif
- }
-
- us->peer.data = peers;
-@@ -323,6 +350,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
- peers->peer[0].current_weight = 0;
- peers->peer[0].max_fails = 1;
- peers->peer[0].fail_timeout = 10;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ peers->peer[0].check_index = (ngx_uint_t) NGX_ERROR;
-+#endif
-
- } else {
-
-@@ -356,6 +386,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
- peers->peer[i].current_weight = 0;
- peers->peer[i].max_fails = 1;
- peers->peer[i].fail_timeout = 10;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ peers->peer[i].check_index = (ngx_uint_t) NGX_ERROR;
-+#endif
- }
- }
-
-@@ -434,6 +467,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
- goto failed;
- }
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ if (ngx_http_check_peer_down(peer->check_index)) {
-+ goto failed;
-+ }
-+#endif
-+
- } else {
-
- /* there are several peers */
-@@ -531,6 +570,12 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp)
- continue;
- }
-
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ if (ngx_http_check_peer_down(peer->check_index)) {
-+ continue;
-+ }
-+#endif
-+
- if (peer->max_fails
- && peer->fails >= peer->max_fails
- && now - peer->checked <= peer->fail_timeout)
-diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h
-index 3f8cbf8..1613168 100644
---- a/src/http/ngx_http_upstream_round_robin.h
-+++ b/src/http/ngx_http_upstream_round_robin.h
-@@ -30,6 +30,10 @@ typedef struct {
|
|
[-]
[+]
|
Deleted |
nginx-0.4.0-no_Werror.patch
^
|
| @@ -1,13 +0,0 @@
-Index: auto/cc/gcc
-===================================================================
---- auto/cc/gcc.orig
-+++ auto/cc/gcc
-@@ -171,7 +171,7 @@
-
-
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS"
-
- # debug
- CFLAGS="$CFLAGS -g"
|
|
[-]
[+]
|
Deleted |
nginx-0.4.0-perl_vendor_install.patch
^
|
| @@ -1,13 +0,0 @@
-Index: auto/install
-===================================================================
---- auto/install.orig
-+++ auto/install
-@@ -7,7 +7,7 @@
- cat << END >> $NGX_MAKEFILE
-
- install_perl_modules:
-- cd $NGX_OBJS/src/http/modules/perl && make install
-+ cd $NGX_OBJS/src/http/modules/perl && make install_vendor
- END
-
- NGX_INSTALL_PERL_MODULES=install_perl_modules
|
|
[-]
[+]
|
Deleted |
nginx-0.6.31-DESTDIR.patch
^
|
| @@ -1,75 +0,0 @@
-Index: auto/install
-===================================================================
---- auto/install.orig 2007-07-30 12:51:55.000000000 +0200
-+++ auto/install 2008-05-29 18:00:45.383221398 +0200
-@@ -19,45 +19,45 @@ cat << END
-
- install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
- $NGX_INSTALL_PERL_MODULES
-- test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'
-+ test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX'
-
-- test -d '`dirname "$NGX_SBIN_PATH"`' \
-- || mkdir -p '`dirname "$NGX_SBIN_PATH"`'
-- test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old'
-- cp $NGX_OBJS/nginx '$NGX_SBIN_PATH'
-+ test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \
-+ || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`'
-+ test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' || mv '\$(DESTDIR)$NGX_SBIN_PATH' '\$(DESTDIR)$NGX_SBIN_PATH.old'
-+ cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'
-
-- test -d '$NGX_CONF_PREFIX' || mkdir -p '$NGX_CONF_PREFIX'
-+ test -d '\$(DESTDIR)$NGX_CONF_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
-
-- cp conf/koi-win '$NGX_CONF_PREFIX'
-- cp conf/koi-utf '$NGX_CONF_PREFIX'
-- cp conf/win-utf '$NGX_CONF_PREFIX'
-+ cp conf/koi-win '\$(DESTDIR)$NGX_CONF_PREFIX'
-+ cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
-+ cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
-
-- test -f '$NGX_CONF_PREFIX/mime.types' \
-- || cp conf/mime.types '$NGX_CONF_PREFIX'
-- cp conf/mime.types '$NGX_CONF_PREFIX/mime.types.default'
-+ test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \
-+ || cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
-+ cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
-
-- test -f '$NGX_CONF_PREFIX/fastcgi_params' \
-- || cp conf/fastcgi_params '$NGX_CONF_PREFIX'
-- cp conf/fastcgi_params '$NGX_CONF_PREFIX/fastcgi_params.default'
-+ test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
-+ || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
-+ cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
-
-- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PREFIX'
-- cp conf/nginx.conf '$NGX_CONF_PREFIX/nginx.conf.default'
-+ test -f '\$(DESTDIR)$NGX_CONF_PATH' || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
-+ cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
-
-- test -d '`dirname "$NGX_PID_PATH"`' \
-- || mkdir -p '`dirname "$NGX_PID_PATH"`'
-+ test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
-+ || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
-
-- test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \
-- mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`'
-+ test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
-+ mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
-
-- test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX'
-+ test -d '\$(DESTDIR)$NGX_PREFIX/html' || cp -r html '\$(DESTDIR)$NGX_PREFIX'
- END
-
-
--if test -n "$NGX_ERROR_LOG_PATH"; then
-+if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then
- cat << END >> $NGX_MAKEFILE
-
-- test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
-- mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
-+ test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \
-+ mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
- END
-
- fi
|
|
[-]
[+]
|
Deleted |
nginx-0.6.31_default_config.patch
^
|
| @@ -1,71 +0,0 @@
-Index: conf/nginx.conf
-===================================================================
---- conf/nginx.conf.orig 2009-04-06 15:43:46.000000000 +0200
-+++ conf/nginx.conf 2009-05-08 20:19:55.436773498 +0200
-@@ -1,12 +1,12 @@
-
--#user nobody;
-+user nginx;
- worker_processes 1;
-
--#error_log logs/error.log;
--#error_log logs/error.log notice;
--#error_log logs/error.log info;
-+#error_log /var/log/nginx/error.log;
-+#error_log /var/log/nginx/error.log notice;
-+#error_log /var/log/nginx/error.log info;
-
--#pid logs/nginx.pid;
-+#pid /var/run/nginx.pid;
-
-
- events {
-@@ -22,7 +22,7 @@ http {
- # '$status $body_bytes_sent "$http_referer" '
- # '"$http_user_agent" "$http_x_forwarded_for"';
-
-- #access_log logs/access.log main;
-+ #access_log /var/log/nginx/access.log main;
-
- sendfile on;
- #tcp_nopush on;
-@@ -38,10 +38,10 @@ http {
-
- #charset koi8-r;
-
-- #access_log logs/host.access.log main;
-+ #access_log /var/log/nginx/host.access.log main;
-
- location / {
-- root html;
-+ root /srv/www/htdocs/;
- index index.html index.htm;
- }
-
-@@ -51,7 +51,7 @@ http {
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
-- root html;
-+ root /srv/www/htdocs/;
- }
-
- # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -87,7 +87,7 @@ http {
- # server_name somename alias another.alias;
-
- # location / {
-- # root html;
-+ # root /srv/www/htdocs/;
- # index index.html index.htm;
- # }
- #}
-@@ -110,7 +110,7 @@ http {
- # ssl_prefer_server_ciphers on;
-
- # location / {
-- # root html;
-+ # root /srv/www/htdocs/;
- # index index.html index.htm;
- # }
- #}
|
|
[-]
[+]
|
Deleted |
nginx-0.6.38-html.patch
^
|
| @@ -1,14 +0,0 @@
-Index: auto/install
-===================================================================
---- auto/install.orig
-+++ auto/install
-@@ -54,8 +54,7 @@
- test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
- mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
-
-- test -d '\$(DESTDIR)$NGX_PREFIX/html' \
-- || cp -r html '\$(DESTDIR)$NGX_PREFIX'
-+ test -d '\$(DESTDIR)/srv/www/htdocs' || install -d '\$(DESTDIR)/srv/www/' && cp -r html '\$(DESTDIR)/srv/www/htdocs'
- END
-
-
|
|
[-]
[+]
|
Deleted |
nginx-auto-cc-gcc.patch
^
|
| @@ -1,13 +0,0 @@
---- auto/cc/gcc.orig 2007-03-22 08:34:53.000000000 -0600
-+++ auto/cc/gcc 2007-03-22 08:58:47.000000000 -0600
-@@ -172,7 +172,9 @@
-
-
- # stop on warning
--CFLAGS="$CFLAGS -Werror"
-+# This combined with Fedora's FORTIFY_SOURCE=2 option causes it nginx
-+# to not compile.
-+#CFLAGS="$CFLAGS -Werror"
-
- # debug
- CFLAGS="$CFLAGS -g"
|
|
[-]
[+]
|
Deleted |
nginx-conf-0.7.x.patch
^
|
| @@ -1,113 +0,0 @@
-Index: conf/nginx.conf
-===================================================================
---- conf/nginx.conf.orig 2009-04-06 15:43:46.000000000 +0200
-+++ conf/nginx.conf 2009-06-25 12:38:03.000000000 +0200
-@@ -1,28 +1,57 @@
-+#######################################################################
-+#
-+# This is the main Nginx configuration file.
-+#
-+# More information about the configuration options is available on
-+# * the English wiki - http://wiki.codemongers.com/Main
-+# * the Russian documentation - http://sysoev.ru/nginx/
-+#
-+#######################################################################
-+
-+#----------------------------------------------------------------------
-+# Main Module - directives that cover basic functionality
-+#
-+# http://wiki.codemongers.com/NginxMainModule
-+#
-+#----------------------------------------------------------------------
-
--#user nobody;
-+user nginx;
- worker_processes 1;
-
--#error_log logs/error.log;
--#error_log logs/error.log notice;
--#error_log logs/error.log info;
-+error_log /var/log/nginx/error.log;
-+#error_log /var/log/nginx/error.log notice;
-+#error_log /var/log/nginx/error.log info;
-+
-+pid /var/run/nginx.pid;
-
--#pid logs/nginx.pid;
-
-+#----------------------------------------------------------------------
-+# Events Module
-+#
-+# http://wiki.codemongers.com/NginxEventsModule
-+#
-+#----------------------------------------------------------------------
-
- events {
- worker_connections 1024;
- }
-
-+#----------------------------------------------------------------------
-+# HTTP Core Module
-+#
-+# http://wiki.codemongers.com/NginxHttpCoreModule
-+#
-+#----------------------------------------------------------------------
-
- http {
-- include mime.types;
-+ include /etc/nginx/mime.types;
- default_type application/octet-stream;
-
-- #log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-- # '$status $body_bytes_sent "$http_referer" '
-- # '"$http_user_agent" "$http_x_forwarded_for"';
-+ log_format main '$remote_addr - $remote_user [$time_local] $request '
-+ '"$status" $body_bytes_sent "$http_referer" '
-+ '"$http_user_agent" "$http_x_forwarded_for"';
-
-- #access_log logs/access.log main;
-+ access_log /var/log/nginx/access.log main;
-
- sendfile on;
- #tcp_nopush on;
-@@ -32,9 +61,18 @@ http {
-
- #gzip on;
-
-+
-+ # Load config files from the /etc/nginx/conf.d directory
-+ include /etc/nginx/conf.d/*.conf;
-+
-+
-+ #
-+ # The default server
-+ #
-+
- server {
- listen 80;
-- server_name localhost;
-+ server_name _;
-
- #charset koi8-r;
-
-@@ -42,16 +80,17 @@ http {
-
- location / {
- root html;
-- index index.html index.htm;
-+ root /usr/share/nginx/html;
-+ index index.html index.htm;
- }
-
-- #error_page 404 /404.html;
-+ error_page 404 /404.html;
-
- # redirect server error pages to the static page /50x.html
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
-- root html;
-+ root /usr/share/nginx/html;
- }
-
- # proxy the PHP scripts to Apache listening on 127.0.0.1:80
|
|
[-]
[+]
|
Deleted |
nginx-conf.patch
^
|
| @@ -1,156 +0,0 @@
---- conf/nginx.conf.orig 2008-05-11 21:19:44.000000000 -0600
-+++ conf/nginx.conf 2008-05-11 22:20:32.000000000 -0600
-@@ -1,28 +1,59 @@
-+#######################################################################
-+#
-+# This is the main Nginx configuration file.
-+#
-+# More information about the configuration options is available on
-+# * the English wiki - http://wiki.codemongers.com/Main
-+# * the Russian documentation - http://sysoev.ru/nginx/
-+#
-+#######################################################################
-+
-+#----------------------------------------------------------------------
-+# Main Module - directives that cover basic functionality
-+#
-+# http://wiki.codemongers.com/NginxMainModule
-+#
-+#----------------------------------------------------------------------
-
--#user nobody;
-+user nginx;
- worker_processes 1;
-
--#error_log logs/error.log;
--#error_log logs/error.log notice;
--#error_log logs/error.log info;
-+error_log /var/log/nginx/error.log;
-+#error_log /var/log/nginx/error.log notice;
-+#error_log /var/log/nginx/error.log info;
-
--#pid logs/nginx.pid;
-+pid /var/run/nginx.pid;
-
-
-+
-+#----------------------------------------------------------------------
-+# Events Module
-+#
-+# http://wiki.codemongers.com/NginxEventsModule
-+#
-+#----------------------------------------------------------------------
-+
- events {
- worker_connections 1024;
- }
-
-
-+#----------------------------------------------------------------------
-+# HTTP Core Module
-+#
-+# http://wiki.codemongers.com/NginxHttpCoreModule
-+#
-+#----------------------------------------------------------------------
-+
- http {
-- include mime.types;
-+ include /etc/nginx/mime.types;
- default_type application/octet-stream;
-
-- #log_format main '$remote_addr - $remote_user [$time_local] $request '
-- # '"$status" $body_bytes_sent "$http_referer" '
-- # '"$http_user_agent" "$http_x_forwarded_for"';
-+ log_format main '$remote_addr - $remote_user [$time_local] $request '
-+ '"$status" $body_bytes_sent "$http_referer" '
-+ '"$http_user_agent" "$http_x_forwarded_for"';
-
-- #access_log logs/access.log main;
-+ access_log /var/log/nginx/access.log main;
-
- sendfile on;
- #tcp_nopush on;
-@@ -31,27 +62,36 @@
- keepalive_timeout 65;
-
- #gzip on;
-+
-+ # Load config files from the /etc/nginx/conf.d directory
-+ include /etc/nginx/conf.d/*.conf;
-
-+ #
-+ # The default server
-+ #
- server {
-- listen 80;
-- server_name localhost;
-+ listen 80;
-+ server_name _;
-
- #charset koi8-r;
-
- #access_log logs/host.access.log main;
-
- location / {
-- root html;
-+ root /usr/share/nginx/html;
- index index.html index.htm;
- }
-
-- #error_page 404 /404.html;
-+ error_page 404 /404.html;
-+ location = /404.html {
-+ root /usr/share/nginx/html;
-+ }
-
- # redirect server error pages to the static page /50x.html
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
-- root html;
-+ root /usr/share/nginx/html;
- }
-
- # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -77,42 +117,4 @@
- # deny all;
- #}
- }
--
--
-- # another virtual host using mix of IP-, name-, and port-based configuration
-- #
-- #server {
-- # listen 8000;
-- # listen somename:8080;
-- # server_name somename alias another.alias;
--
-- # location / {
-- # root html;
-- # index index.html index.htm;
-- # }
-- #}
--
--
-- # HTTPS server
-- #
-- #server {
-- # listen 443;
-- # server_name localhost;
--
-- # ssl on;
-- # ssl_certificate cert.pem;
-- # ssl_certificate_key cert.key;
--
-- # ssl_session_timeout 5m;
-- # ssl_protocols SSLv2 SSLv3 TLSv1;
-- # ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
-- # ssl_prefer_server_ciphers on;
--
-- # location / {
-- # root html;
-- # index index.html index.htm;
-- # }
-- #}
--
-- }
|
|
[-]
[+]
|
Deleted |
nginx-syslog.patch
^
|
| @@ -1,246 +0,0 @@
-diff -ruN nginx-0.8.4_orig/auto/make nginx-0.8.4_syslog/auto/make
---- nginx-0.8.4_orig/auto/make 2009-05-12 20:15:43.000000000 +0700
-+++ nginx-0.8.4_syslog/auto/make 2009-07-08 16:32:06.000000000 +0700
-@@ -15,6 +15,10 @@
- ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep
- ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"`
-
-+#SYSLOG
-+if [[ "${USE_SYSLOG}" == "YES" ]]; then
-+ CFLAGS="$CFLAGS -DUSE_SYSLOG"
-+fi
-
- cat << END > $NGX_MAKEFILE
-
-diff -ruN nginx-0.8.4_orig/auto/options nginx-0.8.4_syslog/auto/options
---- nginx-0.8.4_orig/auto/options 2009-05-18 23:50:32.000000000 +0700
-+++ nginx-0.8.4_syslog/auto/options 2009-07-08 17:57:57.000000000 +0700
-@@ -110,6 +110,8 @@
- MD5_OPT=
- MD5_ASM=NO
-
-+USE_SYSLOG=NO
-+
- USE_SHA1=NO
- SHA1=NONE
- SHA1_OPT=
-@@ -252,6 +254,8 @@
- --with-md5-opt=*) MD5_OPT="$value" ;;
- --with-md5-asm) MD5_ASM=YES ;;
-
-+ --with-syslog) USE_SYSLOG=YES ;;
-+
- --with-sha1=*) SHA1="$value" ;;
- --with-sha1-opt=*) SHA1_OPT="$value" ;;
- --with-sha1-asm) SHA1_ASM=YES ;;
-@@ -381,6 +385,8 @@
- --with-md5-opt=OPTIONS set additional options for md5 building
- --with-md5-asm use md5 assembler sources
-
-+ --with-syslog use syslog instead of files to log messages
-+
- --with-sha1=DIR set path to sha1 library sources
- --with-sha1-opt=OPTIONS set additional options for sha1 building
- --with-sha1-asm use sha1 assembler sources
-@@ -395,6 +401,7 @@
- --with-openssl-opt=OPTIONS set additional options for OpenSSL building
-
- --with-debug enable the debugging logging
-+
-
- END
-
-diff -ruN nginx-0.8.4_orig/auto/summary nginx-0.8.4_syslog/auto/summary
---- nginx-0.8.4_orig/auto/summary 2009-05-26 21:28:49.000000000 +0700
-+++ nginx-0.8.4_syslog/auto/summary 2009-07-08 16:35:19.000000000 +0700
-@@ -71,6 +71,11 @@
- *) echo " + using zlib library: $ZLIB" ;;
- esac
-
-+case $USE_SYSLOG in
-+ YES) echo " + using syslog" ;;
-+ *) echo " + syslog is not used" ;;
-+esac
-+
- echo
-
-
-diff -ruN nginx-0.8.4_orig/src/core/nginx.c nginx-0.8.4_syslog/src/core/nginx.c
---- nginx-0.8.4_orig/src/core/nginx.c 2009-06-06 19:41:31.000000000 +0700
-+++ nginx-0.8.4_syslog/src/core/nginx.c 2009-07-08 16:39:57.000000000 +0700
-@@ -8,6 +8,9 @@
- #include <ngx_core.h>
- #include <nginx.h>
-
-+#ifdef USE_SYSLOG
-+#include <syslog.h>
-+#endif
-
- static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle);
- static ngx_int_t ngx_get_options(int argc, char *const *argv);
-@@ -271,6 +274,11 @@
- ngx_ssl_init(log);
- #endif
-
-+ /* SYSLOG SUPPORT */
-+#ifdef USE_SYSLOG
-+ openlog("nginx", LOG_ODELAY, LOG_DAEMON);
-+#endif
-+
- /*
- * init_cycle->log is required for signal handlers and
- * ngx_process_options()
-@@ -382,6 +390,10 @@
- ngx_master_process_cycle(cycle);
- }
-
-+#ifdef USE_SYSLOG
-+ closelog();
-+#endif
-+
- return 0;
- }
-
-diff -ruN nginx-0.8.4_orig/src/core/ngx_conf_file.c nginx-0.8.4_syslog/src/core/ngx_conf_file.c
---- nginx-0.8.4_orig/src/core/ngx_conf_file.c 2009-06-02 21:00:01.000000000 +0700
-+++ nginx-0.8.4_syslog/src/core/ngx_conf_file.c 2009-07-08 19:25:57.000000000 +0700
-@@ -907,6 +907,12 @@
- full.data = NULL;
- #endif
-
-+#ifdef USE_SYSLOG
-+ if (name->len) {
-+ name->len = 0;
-+ }
-+#endif
-+
- if (name->len) {
- full = *name;
-
-diff -ruN nginx-0.8.4_orig/src/core/ngx_log.c nginx-0.8.4_syslog/src/core/ngx_log.c
---- nginx-0.8.4_orig/src/core/ngx_log.c 2009-04-30 20:53:42.000000000 +0700
-+++ nginx-0.8.4_syslog/src/core/ngx_log.c 2009-07-08 19:26:02.000000000 +0700
-@@ -7,6 +7,9 @@
- #include <ngx_config.h>
- #include <ngx_core.h>
-
-+#ifdef USE_SYSLOG
-+#include <syslog.h>
-+#endif
-
- static char *ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-
-@@ -90,9 +93,11 @@
- u_char *p, *last, *msg;
- u_char errstr[NGX_MAX_ERROR_STR];
-
-+#ifndef USE_SYSLOG
- if (log->file->fd == NGX_INVALID_FILE) {
- return;
- }
-+#endif
-
- last = errstr + NGX_MAX_ERROR_STR;
-
-@@ -139,7 +144,21 @@
-
- ngx_linefeed(p);
-
-+#ifdef USE_SYSLOG
-+ /* allocate a string which can hold the error message */
-+ char *syslogstr;
-+
-+ if ((syslogstr = calloc((p - errstr + 1), sizeof(char))) != NULL) {
-+ strncpy(syslogstr, errstr, p - errstr);
-+
-+ /* write to syslog */
-+ syslog(LOG_CRIT, "%s", syslogstr);
-+
-+ free(syslogstr);
-+ }
-+#else
- (void) ngx_write_fd(log->file->fd, errstr, p - errstr);
-+#endif
-
- if (!ngx_use_stderr
- || level > NGX_LOG_WARN
-@@ -428,9 +447,13 @@
-
- value = cf->args->elts;
-
-+#ifdef USE_SYSLOG
-+ value[1].data = "stderr";
-+#endif
-+
- if (ngx_strcmp(value[1].data, "stderr") == 0) {
- name.len = 0;
-- name.data = NULL;
-+ name.data = "";
-
- } else {
- name = value[1];
-diff -ruN nginx-0.8.4_orig/src/http/modules/ngx_http_log_module.c nginx-0.8.4_syslog/src/http/modules/ngx_http_log_module.c
---- nginx-0.8.4_orig/src/http/modules/ngx_http_log_module.c 2009-06-02 23:09:44.000000000 +0700
-+++ nginx-0.8.4_syslog/src/http/modules/ngx_http_log_module.c 2009-07-08 19:56:29.000000000 +0700
-@@ -8,6 +8,9 @@
- #include <ngx_core.h>
- #include <ngx_http.h>
-
-+#ifdef USE_SYSLOG
-+#include <syslog.h>
-+#endif
-
- typedef struct ngx_http_log_op_s ngx_http_log_op_t;
-
-@@ -310,6 +313,19 @@
- ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf,
- size_t len)
- {
-+#ifdef USE_SYSLOG
|
|
[-]
[+]
|
Deleted |
nginx-unix-sockets.diff
^
|
| @@ -1,69 +0,0 @@
-diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
-index 4c18036..59998be 100644
---- a/src/core/ngx_inet.c
-+++ b/src/core/ngx_inet.c
-@@ -68,7 +68,9 @@ ngx_sock_ntop(struct sockaddr *sa, u_char *text, size_t len, ngx_uint_t port)
- size_t n;
- struct sockaddr_in6 *sin6;
- #endif
--
-+ struct sockaddr_un *sun;
-+ size_t path_len;
-+
- switch (sa->sa_family) {
-
- case AF_INET:
-@@ -108,6 +110,17 @@ ngx_sock_ntop(struct sockaddr *sa, u_char *text, size_t len, ngx_uint_t port)
- return n;
- #endif
-
-+ case AF_UNIX:
-+
-+ sun = (struct sockaddr_un *) sa;
-+ path_len = strlen(sun->sun_path);
-+ if (path_len == 0) {
-+ return ngx_snprintf(text, len, "(unknown)") - text;
-+ } else {
-+ ngx_copy(text, (const u_char *) sun->sun_path, path_len);
-+ return path_len;
-+ }
-+
- default:
- return 0;
- }
-diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
-index 4930b50..5e3493e 100644
---- a/src/http/ngx_http_request.c
-+++ b/src/http/ngx_http_request.c
-@@ -2426,7 +2426,11 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
-
- if (tcp_nodelay
- && clcf->tcp_nodelay
-- && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
-+ && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET
-+ #if (NGX_HAVE_UNIX_DOMAIN)
-+ && c->sockaddr->sa_family != AF_UNIX
-+ #endif
-+ )
- {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
-diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
-index 8c7f9a4..7ab60ab 100644
---- a/src/http/ngx_http_upstream.c
-+++ b/src/http/ngx_http_upstream.c
-@@ -1957,7 +1957,13 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
- return;
- }
-
-- if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
-+ if (clcf->tcp_nodelay
-+ && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET
-+ #if (NGX_HAVE_UNIX_DOMAIN)
-+ && c->sockaddr->sa_family != AF_UNIX
-+ #endif
-+ )
-+ {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
- tcp_nodelay = 1;
|
|
[-]
[+]
|
Deleted |
nginx-versiontilt.patch
^
|
| @@ -1,13 +0,0 @@
---- nginx-1.2.0/src/core/nginx.h 2012-04-23 14:54:14.000000000 +0200
-+++ nginx-1.2.0/src/core/nginx.h~ 2012-04-25 16:20:55.000000000 +0200
-@@ -10,8 +10,8 @@
-
-
- #define nginx_version 1002000
--#define NGINX_VERSION "1.2.0"
--#define NGINX_VER "nginx/" NGINX_VERSION
-+#define NGINX_VERSION ""
-+#define NGINX_VER "" NGINX_VERSION
-
- #define NGINX_VAR "NGINX"
- #define NGX_OLDPID_EXT ".oldbin"
|
|
[-]
[+]
|
Deleted |
nginx_sysguard_1.3.9.patch
^
|
| @@ -1,12 +0,0 @@
-diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
-index f234840..b7665e9 100644
---- a/src/http/ngx_http_request.h
-+++ b/src/http/ngx_http_request.h
-@@ -489,6 +489,7 @@ struct ngx_http_request_s {
- */
- unsigned limit_conn_set:1;
- unsigned limit_req_set:1;
-+ unsigned sysguard_set:1;
-
- #if 0
- unsigned cacheable:1;
|
|
[-]
[+]
|
Deleted |
ngx-detect-heartbleed.patch
^
|
| @@ -1,44 +0,0 @@
---- src/event/ngx_event_openssl.c
-+++ src/event/ngx_event_openssl.c
-@@ -18,6 +18,9 @@ typedef struct {
- static int ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store);
- static void ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where,
- int ret);
-+static void ngx_ssl_msg_callback(
-+ int write_p, int version, int content_type,
-+ const void *buf, size_t len, SSL *ssl, void *log);
- static void ngx_ssl_handshake_handler(ngx_event_t *ev);
- static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n);
- static void ngx_ssl_write_handler(ngx_event_t *wev);
-@@ -244,6 +247,8 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data)
- SSL_CTX_set_read_ahead(ssl->ctx, 1);
-
- SSL_CTX_set_info_callback(ssl->ctx, ngx_ssl_info_callback);
-+ SSL_CTX_set_msg_callback(ssl->ctx, ngx_ssl_msg_callback);
-+ SSL_CTX_set_msg_callback_arg(ssl->ctx, ssl->log);
-
- return NGX_OK;
- }
-@@ -532,6 +537,22 @@ ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)
- return 1;
- }
-
-+static void ngx_ssl_msg_callback(
-+ int write_p, int version, int content_type,
-+ const void *buf, size_t len, ngx_ssl_conn_t *ssl, void *log)
-+{
-+ if (write_p == 0 && content_type == TLS1_RT_HEARTBEAT) {
-+ unsigned char *p = buf;
-+ unsigned int payload;
-+
-+ payload = (((unsigned int)(p[1])) << 8) | ((unsigned int)(p[2]));
-+ if (1 + 2 + payload + 16 > len) {
-+ ngx_log_error(NGX_LOG_ALERT, ((ngx_log_t*)log), 0, "Heartbleed attack detected");
-+ }
-+ }
-+
-+}
-+
-
- static void
- ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
openssl-rc4tilt.patch
^
|
| @@ -1,17 +0,0 @@
-Nur in openssl-1.0.1j-norc4: openssl__disable_rc4.patch.
-diff -ru openssl-1.0.1j/ssl/s3_lib.c openssl-1.0.1j-norc4/ssl/s3_lib.c
---- openssl-1.0.1j/ssl/s3_lib.c 2014-10-15 14:53:39.000000000 +0200
-+++ openssl-1.0.1j-norc4/ssl/s3_lib.c 2014-10-23 18:57:16.468131600 +0200
-@@ -3844,6 +3844,11 @@
- (TLS1_get_version(s) < TLS1_2_VERSION))
- continue;
-
-+ /* Disable RC4 for TLS v1.1+ */
-+ if ((c->algorithm_enc == SSL_RC4) &&
-+ (TLS1_get_version(s) >= TLS1_1_VERSION))
-+ continue;
-+
- ssl_set_cert_masks(cert,c);
- mask_k = cert->mask_k;
- mask_a = cert->mask_a;
-Nur in openssl-1.0.1j-norc4/ssl: s3_lib.c.orig.
|
|
[-]
[+]
|
Deleted |
404.html
^
|
| @@ -1,119 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
- <title>The page is not found</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <style type="text/css">
- /*<![CDATA[*/
- body {
- background-color: #fff;
- color: #000;
- font-size: 0.9em;
- font-family: sans-serif,helvetica;
- margin: 0;
- padding: 0;
- }
- :link {
- color: #c00;
- }
- :visited {
- color: #c00;
- }
- a:hover {
- color: #f50;
- }
- h1 {
- text-align: center;
- margin: 0;
- padding: 0.6em 2em 0.4em;
- background-color: #294172;
- color: #fff;
- font-weight: normal;
- font-size: 1.75em;
- border-bottom: 2px solid #000;
- }
- h1 strong {
- font-weight: bold;
- font-size: 1.5em;
- }
- h2 {
- text-align: center;
- background-color: #3C6EB4;
- font-size: 1.1em;
- font-weight: bold;
- color: #fff;
- margin: 0;
- padding: 0.5em;
- border-bottom: 2px solid #294172;
- }
- h3 {
- text-align: center;
- background-color: #ff0000;
- padding: 0.5em;
- color: #fff;
- }
- hr {
- display: none;
- }
- .content {
- padding: 1em 5em;
- }
- .alert {
- border: 2px solid #000;
- }
-
- img {
- border: 2px solid #fff;
- padding: 2px;
- margin: 2px;
- }
- a:hover img {
- border: 2px solid #294172;
- }
- .logos {
- margin: 1em;
- text-align: center;
- }
- /*]]>*/
- </style>
- </head>
-
- <body>
- <h1><strong>nginx error!</strong></h1>
-
- <div class="content">
-
- <h3>The page you are looking for is not found.</h3>
-
- <div class="alert">
- <h2>Website Administrator</h2>
- <div class="content">
- <p>Something has triggered missing webpage on your
- website. This is the default 404 error page for
- <strong>nginx</strong> that is distributed with
- EPEL. It is located
- <tt>/usr/share/nginx/html/404.html</tt></p>
-
- <p>You should customize this error page for your own
- site or edit the <tt>error_page</tt> directive in
- the <strong>nginx</strong> configuration file
- <tt>/etc/nginx/nginx.conf</tt>.</p>
-
- </div>
- </div>
-
- <div class="logos">
- <a href="http://nginx.net/"><img
- src="nginx-logo.png"
- alt="[ Powered by nginx ]"
- width="121" height="32" /></a>
-
- <a href="http://fedoraproject.org/"><img
- src="poweredby.png"
- alt="[ Powered by Fedora EPEL ]"
- width="88" height="31" /></a>
- </div>
- </div>
- </body>
-</html>
|
|
[-]
[+]
|
Deleted |
50x.html
^
|
| @@ -1,119 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
- <title>The page is temporarily unavailable</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <style type="text/css">
- /*<![CDATA[*/
- body {
- background-color: #fff;
- color: #000;
- font-size: 0.9em;
- font-family: sans-serif,helvetica;
- margin: 0;
- padding: 0;
- }
- :link {
- color: #c00;
- }
- :visited {
- color: #c00;
- }
- a:hover {
- color: #f50;
- }
- h1 {
- text-align: center;
- margin: 0;
- padding: 0.6em 2em 0.4em;
- background-color: #294172;
- color: #fff;
- font-weight: normal;
- font-size: 1.75em;
- border-bottom: 2px solid #000;
- }
- h1 strong {
- font-weight: bold;
- font-size: 1.5em;
- }
- h2 {
- text-align: center;
- background-color: #3C6EB4;
- font-size: 1.1em;
- font-weight: bold;
- color: #fff;
- margin: 0;
- padding: 0.5em;
- border-bottom: 2px solid #294172;
- }
- h3 {
- text-align: center;
- background-color: #ff0000;
- padding: 0.5em;
- color: #fff;
- }
- hr {
- display: none;
- }
- .content {
- padding: 1em 5em;
- }
- .alert {
- border: 2px solid #000;
- }
-
- img {
- border: 2px solid #fff;
- padding: 2px;
- margin: 2px;
- }
- a:hover img {
- border: 2px solid #294172;
- }
- .logos {
- margin: 1em;
- text-align: center;
- }
- /*]]>*/
- </style>
- </head>
-
- <body>
- <h1><strong>nginx error!</strong></h1>
-
- <div class="content">
-
- <h3>The page you are looking for is temporarily unavailable. Please try again later.</h3>
-
- <div class="alert">
- <h2>Website Administrator</h2>
- <div class="content">
- <p>Something has triggered an error on your
- website. This is the default error page for
- <strong>nginx</strong> that is distributed with
- EPEL. It is located
- <tt>/usr/share/nginx/html/50x.html</tt></p>
-
- <p>You should customize this error page for your own
- site or edit the <tt>error_page</tt> directive in
- the <strong>nginx</strong> configuration file
- <tt>/etc/nginx/nginx.conf</tt>.</p>
-
- </div>
- </div>
-
- <div class="logos">
- <a href="http://nginx.net/"><img
- src="nginx-logo.png"
- alt="[ Powered by nginx ]"
- width="121" height="32" /></a>
-
- <a href="http://fedoraproject.org/"><img
- src="poweredby.png"
- alt="[ Powered by Fedora EPEL ]"
- width="88" height="31" /></a>
- </div>
- </div>
- </body>
-</html>
|
|
|
Deleted |
Nginx-limit-traffic-rate-module.tar.gz
^
|
|
[-]
[+]
|
Deleted |
config
^
|
| @@ -1,856 +0,0 @@
-
-
-
-
-
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset='utf-8'>
- <meta http-equiv="X-UA-Compatible" content="chrome=1">
- <title>config at master from bigplum/Nginx-limit-traffic-rate-module - GitHub</title>
- <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub" />
- <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub" />
-
- <link href="https://assets0.github.com/stylesheets/bundle_common.css?594c3ba479ae702f0f0215dba898d5fb809fc253" media="screen" rel="stylesheet" type="text/css" />
-<link href="https://assets3.github.com/stylesheets/bundle_github.css?594c3ba479ae702f0f0215dba898d5fb809fc253" media="screen" rel="stylesheet" type="text/css" />
-
- <script type="text/javascript">
- if (typeof console == "undefined" || typeof console.log == "undefined")
- console = { log: function() {} }
- </script>
- <script type="text/javascript" charset="utf-8">
- var GitHub = {}
- var github_user = null
-
- </script>
- <script src="https://assets2.github.com/javascripts/jquery/jquery-1.4.2.min.js?594c3ba479ae702f0f0215dba898d5fb809fc253" type="text/javascript"></script>
- <script src="https://assets2.github.com/javascripts/bundle_common.js?594c3ba479ae702f0f0215dba898d5fb809fc253" type="text/javascript"></script>
-<script src="https://assets3.github.com/javascripts/bundle_github.js?594c3ba479ae702f0f0215dba898d5fb809fc253" type="text/javascript"></script>
-
-
- <script type="text/javascript" charset="utf-8">
- GitHub.spy({
- repo: "bigplum/Nginx-limit-traffic-rate-module"
- })
- </script>
-
-
- <link href="https://github.com/bigplum/Nginx-limit-traffic-rate-module/commits/master.atom" rel="alternate" title="Recent Commits to Nginx-limit-traffic-rate-module:master" type="application/atom+xml" />
-
- <meta name="description" content="Limiting rate by given variables(like $request_uri, $remote_addr, etc..)." />
- <script type="text/javascript">
- GitHub.nameWithOwner = GitHub.nameWithOwner || "bigplum/Nginx-limit-traffic-rate-module";
- GitHub.currentRef = 'master';
- GitHub.commitSHA = "c0c90f55a8cb545559b73eafb91a0af3f2d8474a";
- GitHub.currentPath = 'config';
- GitHub.masterBranch = "master";
-
-
- </script>
-
-
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-3769691-2']);
- _gaq.push(['_setDomainName', 'none']);
- _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script');
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- ga.setAttribute('async', 'true');
- document.documentElement.firstChild.appendChild(ga);
- })();
- </script>
-
-
- </head>
-
-
-
- <body class="logged_out page-blob">
-
-
-
-
-
-
-
-
-
-
- <div class="subnavd" id="main">
- <div id="header" class="true">
-
- <a class="logo boring" href="https://github.com">
- <img src="/images/modules/header/logov3.png?changed" class="default" alt="github" />
- <!--[if (gt IE 8)|!(IE)]><!-->
- <img src="/images/modules/header/logov3-hover.png" class="hover" alt="github" />
- <!--<![endif]-->
- </a>
-
-
- <div class="topsearch">
-
- <ul class="nav logged_out">
- <li class="pricing"><a href="/plans">Pricing and Signup</a></li>
- <li class="explore"><a href="/explore">Explore GitHub</a></li>
- <li class="features"><a href="/features">Features</a></li>
- <li class="blog"><a href="/blog">Blog</a></li>
- <li class="login"><a href="/login?return_to=https://github.com/bigplum/Nginx-limit-traffic-rate-module/blob/master/config">Login</a></li>
- </ul>
-
-</div>
-
- </div>
-
-
-
-
- <div class="site">
- <div class="pagehead repohead vis-public ">
-
-
-
- <div class="title-actions-bar">
- <h1>
- <a href="/bigplum">bigplum</a> / <strong><a href="https://github.com/bigplum/Nginx-limit-traffic-rate-module">Nginx-limit-traffic-rate-module</a></strong>
-
-
- </h1>
-
-
- <ul class="actions">
-
-
-
- <li class="for-owner" style="display:none"><a href="https://github.com/bigplum/Nginx-limit-traffic-rate-module/admin" class="minibutton btn-admin "><span><span class="icon"></span>Admin</span></a></li>
- <li>
- <a href="/bigplum/Nginx-limit-traffic-rate-module/toggle_watch" class="minibutton btn-watch " id="watch_button" onclick="var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', 'authenticity_token'); s.setAttribute('value', '5fb90cea03b51d302598461c3969cdb3211d3084'); f.appendChild(s);f.submit();return false;" style="display:none"><span><span class="icon"></span>Watch</span></a>
- <a href="/bigplum/Nginx-limit-traffic-rate-module/toggle_watch" class="minibutton btn-watch " id="unwatch_button" onclick="var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', 'authenticity_token'); s.setAttribute('value', '5fb90cea03b51d302598461c3969cdb3211d3084'); f.appendChild(s);f.submit();return false;" style="display:none"><span><span class="icon"></span>Unwatch</span></a>
- </li>
-
-
- <li class="for-notforked" style="display:none"><a href="/bigplum/Nginx-limit-traffic-rate-module/fork" class="minibutton btn-fork " id="fork_button" onclick="var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', 'authenticity_token'); s.setAttribute('value', '5fb90cea03b51d302598461c3969cdb3211d3084'); f.appendChild(s);f.submit();return false;"><span><span class="icon"></span>Fork</span></a></li>
- <li class="for-hasfork" style="display:none"><a href="#" class="minibutton btn-fork " id="your_fork_button"><span><span class="icon"></span>Your Fork</span></a></li>
-
-
-
-
-
-
- <li class="repostats">
- <ul class="repo-stats">
- <li class="watchers"><a href="/bigplum/Nginx-limit-traffic-rate-module/watchers" title="Watchers" class="tooltipped downwards">3</a></li>
- <li class="forks"><a href="/bigplum/Nginx-limit-traffic-rate-module/network" title="Forks" class="tooltipped downwards">2</a></li>
- </ul>
- </li>
- </ul>
-
- </div>
-
-
- <ul class="tabs">
- <li><a href="https://github.com/bigplum/Nginx-limit-traffic-rate-module" class="selected" highlight="repo_source">Source</a></li>
- <li><a href="https://github.com/bigplum/Nginx-limit-traffic-rate-module/commits/master" highlight="repo_commits">Commits</a></li>
- <li><a href="/bigplum/Nginx-limit-traffic-rate-module/network" highlight="repo_network">Network</a></li>
- <li><a href="/bigplum/Nginx-limit-traffic-rate-module/pulls" highlight="repo_pulls">Pull Requests (0)</a></li>
-
-
-
-
-
- <li><a href="/bigplum/Nginx-limit-traffic-rate-module/issues" highlight="issues">Issues (0)</a></li>
-
-
-
- <li><a href="/bigplum/Nginx-limit-traffic-rate-module/graphs" highlight="repo_graphs">Graphs</a></li>
-
- <li class="contextswitch nochoices">
- <span class="toggle leftwards" >
- <em>Branch:</em>
- <code>master</code>
- </span>
- </li>
- </ul>
-
- <div style="display:none" id="pl-description"><p><em class="placeholder">click here to add a description</em></p></div>
- <div style="display:none" id="pl-homepage"><p><em class="placeholder">click here to add a homepage</em></p></div>
-
- <div class="subnav-bar">
-
- <ul>
- <li>
- <a href="#" class="dropdown">Switch Branches (1)</a>
- <ul>
-
-
- <li><strong>master ✓</strong></li>
-
- </ul>
- </li>
- <li>
- <a href="#" class="dropdown defunct">Switch Tags (0)</a>
-
- </li>
- <li>
-
- <a href="/bigplum/Nginx-limit-traffic-rate-module/branches" class="manage">Branch List</a>
-
|
|
[-]
[+]
|
Deleted |
index.html
^
|
| @@ -1,116 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
- <title>Test Page for the Nginx HTTP Server on EPEL</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <style type="text/css">
- /*<![CDATA[*/
- body {
- background-color: #fff;
- color: #000;
- font-size: 0.9em;
- font-family: sans-serif,helvetica;
- margin: 0;
- padding: 0;
- }
- :link {
- color: #c00;
- }
- :visited {
- color: #c00;
- }
- a:hover {
- color: #f50;
- }
- h1 {
- text-align: center;
- margin: 0;
- padding: 0.6em 2em 0.4em;
- background-color: #294172;
- color: #fff;
- font-weight: normal;
- font-size: 1.75em;
- border-bottom: 2px solid #000;
- }
- h1 strong {
- font-weight: bold;
- font-size: 1.5em;
- }
- h2 {
- text-align: center;
- background-color: #3C6EB4;
- font-size: 1.1em;
- font-weight: bold;
- color: #fff;
- margin: 0;
- padding: 0.5em;
- border-bottom: 2px solid #294172;
- }
- hr {
- display: none;
- }
- .content {
- padding: 1em 5em;
- }
- .alert {
- border: 2px solid #000;
- }
-
- img {
- border: 2px solid #fff;
- padding: 2px;
- margin: 2px;
- }
- a:hover img {
- border: 2px solid #294172;
- }
- .logos {
- margin: 1em;
- text-align: center;
- }
- /*]]>*/
- </style>
- </head>
-
- <body>
- <h1>Welcome to <strong>nginx</strong> on EPEL!</h1>
-
- <div class="content">
- <p>This page is used to test the proper operation of the
- <strong>nginx</strong> HTTP server after it has been
- installed. If you can read this page, it means that the
- web server installed at this site is working
- properly.</p>
-
- <div class="alert">
- <h2>Website Administrator</h2>
- <div class="content">
- <p>This is the default <tt>index.html</tt> page that
- is distributed with <strong>nginx</strong> on
- EPEL. It is located in
- <tt>/usr/share/nginx/html</tt>.</p>
-
- <p>You should now put your content in a location of
- your choice and edit the <tt>root</tt> configuration
- directive in the <strong>nginx</strong>
- configuration file
- <tt>/etc/nginx/nginx.conf</tt>.</p>
-
- </div>
- </div>
-
- <div class="logos">
- <a href="http://nginx.net/"><img
- src="nginx-logo.png"
- alt="[ Powered by nginx ]"
- width="121" height="32" /></a>
-
- <a href="http://fedoraproject.org/"><img
- src="poweredby.png"
- alt="[ Powered by Fedora EPEL ]"
- width="88" height="31" /></a>
- </div>
- </div>
- </body>
-</html>
|
|
[-]
[+]
|
Deleted |
magento-sample.conf-disabled
^
|
| @@ -1,113 +0,0 @@
-server {
- include /etc/nginx/port.conf;
- server_name example.com;
- return 301 $scheme://www.example.com$request_uri;
-}
-
-server {
- include /etc/nginx/port.conf;
- #listen 443 ssl;
- server_name www.example.com; ## Domain is here
- root /var/www/html;
- access_log /var/log/nginx/access_www.example.com.log main;
-
- if ($http_user_agent = "") { return 444;}
-
- ####################################################################################
- ## SSL CONFIGURATION
-
- #ssl_certificate /etc/ssl/certs/www_server_com.chained.crt;
- #ssl_certificate_key /etc/ssl/certs/server.key;
-
- ####################################################################################
- ## Server maintenance block. insert dev ip 1.2.3.4 static address www.whatismyip.com
-
- #if ($remote_addr !~ "^(1.2.3.4|1.2.3.4)$") {
- #return 503;
- #}
-
- #error_page 503 @maintenance;
- #location @maintenance {
- #rewrite ^(.*)$ /error_page/503.html break;
- #internal;
- #access_log off;
- #log_not_found off;
- #}
-
- ####################################################################################
- ## 403 error log/page
-
- #error_page 403 /403.html;
- #location = /403.html {
- #root /var/www/html/error_page;
- #internal;
- #access_log /var/log/nginx/403.log error403;
- #}
-
- ####################################################################################
- ## Main Magento location
-
- location / {
- try_files $uri $uri/ @handler;
- }
-
- ####################################################################################
- ## These locations would be hidden by .htaccess normally, protected
-
- location ~ (/(app/|includes/|pkginfo/|var/|errors/local.xml)|/\.) {
- deny all;
- }
-
- ####################################################################################
- ## Protecting /admin/ and /downloader/ 1.2.3.4 = static ip (www.whatismyip.com)
-
- #location /downloader/ {
- #allow 1.2.3.4; allow 1.2.3.4; deny all;
- #rewrite ^/downloader/(.*)$ /downloader/index.php$1;
- #}
- #location /admin {
- #allow 1.2.3.4; allow 1.2.3.4; deny all;
- #rewrite / /@handler;
- #}
-
- ####################################################################################
- ## Images, scripts and styles set far future Expires header
-
- location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
- open_file_cache max=10000 inactive=8h;
- open_file_cache_valid 1h;
- open_file_cache_min_uses 2;
- open_file_cache_errors off;
- expires max;
- log_not_found off;
- access_log off;
- }
-
- ####################################################################################
- ## Main Magento location
-
- location @handler {
- rewrite / /index.php?$args;
- }
-
- location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
- rewrite ^(.*.php)/ $1 last;
- }
-
- ####################################################################################
- ## Execute PHP scripts
-
- location ~ .php$ {
- add_header X-UA-Compatible 'IE=Edge,chrome=1';
- add_header X-Time-Spent $request_time;
- try_files $uri $uri/ =404;
- fastcgi_pass 127.0.0.1:9000;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- ## Store code with multi domain
- #fastcgi_param MAGE_RUN_CODE $storecode;
- ## Default Store code
- fastcgi_param MAGE_RUN_CODE default;
- fastcgi_param MAGE_RUN_TYPE store; ## or website;
- include fastcgi_params; ## See /etc/nginx/fastcgi_params
- }
- }
|
|
|
Deleted |
nginx-1.7.9.tar.gz
^
|
|
|
Deleted |
nginx-http-sysguard.tar.gz
^
|
|
|
Deleted |
nginx-logo.png
^
|
|
|
Deleted |
nginx-munin.tar.gz
^
|
|
|
Deleted |
nginx-rtmp-module-1.1.2.tar.bz2
^
|
|
|
Deleted |
nginx-rtmp-module-1.1.5.tar.bz2
^
|
|
|
Deleted |
nginx-rtmp-module-1.1.5.tar.gz
^
|
|
[-]
[+]
|
Deleted |
nginx-statsd.conf-sample
^
|
| @@ -1,39 +0,0 @@
-http {
-
- # Set the server that you want to send stats to.
- statsd_server your.statsd.server.com;
-
- # Randomly sample 10% of requests so that you do not overwhelm your statsd server.
- # Defaults to sending all statsd (100%).
- statsd_sample_rate 10; # 10% of requests
-
-
- server {
- listen 80;
- server_name www.your.domain.com;
-
- # Increment "your_product.requests" by 1 whenever any request hits this server.
- statsd_count "your_product.requests" 1;
-
- location / {
-
- # Increment the key by 1 when this location is hit.
- statsd_count "your_product.pages.index_requests" 1;
-
- # Increment the key by 1, but only if $request_completion is set to something.
- statsd_count "your_product.pages.index_responses" 1 "$request_completion";
-
- # Send a timing to "your_product.pages.index_response_time" equal to the value
- # returned from the upstream server. If this value evaluates to 0 or empty-string,
- # it will not be sent. Thus, there is no need to add a test.
- statsd_timing "your_product.pages.index_response_time" "$upstream_response_time";
-
- # Increment a key based on the value of a custom header. Only sends the value if
- # the custom header exists in the upstream response.
- statsd_count "your_product.custom_$upstream_http_x_some_custom_header" 1
- "$upstream_http_x_some_custom_header";
-
- proxy_pass http://some.other.domain.com;
- }
- }
-}
\ No newline at end of file
|
|
|
Deleted |
nginx-statsd.tar.gz
^
|
|
|
Deleted |
nginx-sticky-module-1.1.tar.gz
^
|
|
|
Deleted |
nginx-sticky-module-ng-1.2.5.tar.gz
^
|
|
|
Deleted |
nginx-upstream-fair.tgz
^
|
|
[-]
[+]
|
Deleted |
nginx.init
^
|
| @@ -1,129 +0,0 @@
-#!/bin/sh
-#
-# nginx - this script starts and stops the nginx daemon
-#
-# chkconfig: - 85 15
-# description: Nginx is an HTTP(S) server, HTTP(S) reverse \
-# proxy and IMAP/POP3 proxy server
-# processname: nginx
-# config: /etc/nginx/nginx.conf
-# config: /etc/sysconfig/nginx
-# pidfile: /var/run/nginx.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "$NETWORKING" = "no" ] && exit 0
-
-nginx="/usr/sbin/nginx"
-prog=$(basename $nginx)
-
-NGINX_CONF_FILE="/etc/nginx/nginx.conf"
-
-[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
-
-lockfile=/var/lock/subsys/nginx
-
-start() {
- [ -x $nginx ] || exit 5
- [ -f $NGINX_CONF_FILE ] || exit 6
- echo -n $"Starting $prog: "
- daemon $nginx -c $NGINX_CONF_FILE
- retval=$?
- echo
- [ $retval -eq 0 ] && touch $lockfile
- return $retval
-}
-
-stop() {
- echo -n $"Stopping $prog: "
- killproc $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- return $retval
-}
-
-restart() {
- configtest_q || configtest || return 6
- stop
- start
-}
-
-reload() {
- configtest_q || configtest || return 6
- echo -n $"Reloading $prog: "
- killproc $nginx -HUP
- echo
-}
-
-configtest() {
- $nginx -t -c $NGINX_CONF_FILE
-}
-
-configtest_q() {
- configtest >/dev/null 2>&1
-}
-
-rh_status() {
- status $prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-# Online upgrade nginx binary on the fly, with no downtime.
-# details: http://sysoev.ru/nginx/docs/control.html#upgrade
-upgrade() {
- configtest_q || configtest || return 6
- echo -n $"Upgrading $prog: "
- kill -USR2 `cat /var/run/$prog.pid`
- sleep 1
- if test -f /var/run/$prog.pid.oldbin
- then
- killproc -p /var/run/$prog.pid.oldbin -QUIT
- echo
- else
- failure $"$prog online upgrade"
- echo
- exit 1
- fi
-}
-
-case "$1" in
- start)
- rh_status_q && exit 0
- $1
- ;;
- stop)
- rh_status_q || exit 0
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- upgrade|force-reload)
- rh_status_q || exit 7
- upgrade
- ;;
- condrestart|try-restart)
- rh_status_q || exit 7
- restart
- ;;
- restart|configtest)
- $1
- ;;
- status|status_q)
- rh_$1
- ;;
- *)
- echo $"Usage: $0 {start|stop|reload|force-reload|restart|try-restart|status|configtest}"
- exit 2
-esac
-
|
|
[-]
[+]
|
Deleted |
nginx.init.suse
^
|
| @@ -1,277 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 1995--2007 Marcus Rückert, SUSE / Novell Inc.
-#
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or (at
-# your option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
-# USA.
-#
-# /etc/init.d/nginx
-# and its symbolic link
-# /(usr/)sbin/rcnginx
-#
-# Template system startup script for some example service/daemon nginx
-#
-# LSB compatible service control script; see http://www.linuxbase.org/spec/
-#
-# Note: This template uses functions rc_XXX defined in /etc/rc.status on
-# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your
-# script on this template and ensure that it works on non UL based LSB
-# compliant Linux distributions, you either have to provide the rc.status
-# functions from UL or change the script to work without them.
-# See skeleton.compat for a template that works with other distros as well.
-#
-### BEGIN INIT INFO
-# Provides: nginx
-# Required-Start: $syslog $remote_fs
-# Should-Start: $time ypbind sendmail
-# Required-Stop: $syslog $remote_fs
-# Should-Stop: $time ypbind sendmail
-# Default-Start: 3 5
-# Default-Stop: 0 1 2 6
-# Short-Description: nginx
-# Description: nginx
-### END INIT INFO
-#
-# Any extensions to the keywords given above should be preceeded by
-# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB.
-#
-# Notes on Required-Start/Should-Start:
-# * There are two different issues that are solved by Required-Start
-# and Should-Start
-# (a) Hard dependencies: This is used by the runlevel editor to determine
-# which services absolutely need to be started to make the start of
-# this service make sense. Example: nfsserver should have
-# Required-Start: $portmap
-# Also, required services are started before the dependent ones.
-# The runlevel editor will warn about such missing hard dependencies
-# and suggest enabling. During system startup, you may expect an error,
-# if the dependency is not fulfilled.
-# (b) Specifying the init script ordering, not real (hard) dependencies.
-# This is needed by insserv to determine which service should be
-# started first (and at a later stage what services can be started
-# in parallel). The tag Should-Start: is used for this.
-# It tells, that if a service is available, it should be started
-# before. If not, never mind.
-# * When specifying hard dependencies or ordering requirements, you can
-# use names of services (contents of their Provides: section)
-# or pseudo names starting with a $. The following ones are available
-# according to LSB (1.1):
-# $local_fs all local file systems are mounted
-# (most services should need this!)
-# $remote_fs all remote file systems are mounted
-# (note that /usr may be remote, so
-# many services should Require this!)
-# $syslog system logging facility up
-# $network low level networking (eth card, ...)
-# $named hostname resolution available
-# $netdaemons all network daemons are running
-# The $netdaemons pseudo service has been removed in LSB 1.2.
-# For now, we still offer it for backward compatibility.
-# These are new (LSB 1.2):
-# $time the system time has been set correctly
-# $portmap SunRPC portmapping service available
-# UnitedLinux extensions:
-# $ALL indicates that a script should be inserted
-# at the end
-# * The services specified in the stop tags
-# (Required-Stop/Should-Stop)
-# specify which services need to be still running when this service
-# is shut down. Often the entries there are just copies or a subset
-# from the respective start tag.
-# * Should-Start/Stop are now part of LSB as of 2.0,
-# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop.
-# insserv does support both variants.
-# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time
-# (%fillup_and_insserv macro in %post of many RPMs) to specify whether
-# a startup script should default to be enabled after installation.
-# It's not used by insserv.
-#
-# Note on runlevels:
-# 0 - halt/poweroff 6 - reboot
-# 1 - single user 2 - multiuser without network exported
-# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm)
-#
-# Note on script names:
-# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html
-# A registry has been set up to manage the init script namespace.
-# http://www.lanana.org/
-# Please use the names already registered or register one or use a
-# vendor prefix.
-
-
-# Check for missing binaries (stale symlinks should not happen)
-# Note: Special treatment of stop for LSB conformance
-NGINX_BIN=/usr/sbin/nginx
-test -x $NGINX_BIN || { echo "$NGINX_BIN not installed";
- if [ "$1" = "stop" ]; then exit 0;
- else exit 5; fi; }
-
-# Check for existence of needed config file and read it
-#NGINX_CONFIG=/etc/sysconfig/nginx
-#test -r $NGINX_CONFIG || { echo "$NGINX_CONFIG not existing";
-# if [ "$1" = "stop" ]; then exit 0;
-# else exit 6; fi; }
-#
-# Read config
-#. $NGINX_CONFIG
-
-# Source LSB init functions
-# providing start_daemon, killproc, pidofproc,
-# log_success_msg, log_failure_msg and log_warning_msg.
-# This is currently not used by UnitedLinux based distributions and
-# not needed for init scripts for UnitedLinux only. If it is used,
-# the functions from rc.status should not be sourced or used.
-#. /lib/lsb/init-functions
-
-# Shell functions sourced from /etc/rc.status:
-# rc_check check and set local and overall rc status
-# rc_status check and set local and overall rc status
-# rc_status -v be verbose in local rc status and clear it afterwards
-# rc_status -v -r ditto and clear both the local and overall rc status
-# rc_status -s display "skipped" and exit with status 3
-# rc_status -u display "unused" and exit with status 3
-# rc_failed set local and overall rc status to failed
-# rc_failed <num> set local and overall rc status to <num>
-# rc_reset clear both the local and overall rc status
-# rc_exit exit appropriate to overall rc status
-# rc_active checks whether a service is activated by symlinks
-. /etc/rc.status
-
-# Reset status of this service
-rc_reset
-
-# Return values acc. to LSB for all commands but status:
-# 0 - success
-# 1 - generic or unspecified error
-# 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
-# 4 - user had insufficient privileges
-# 5 - program is not installed
-# 6 - program is not configured
-# 7 - program is not running
-# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-#
-# Note that starting an already running service, stopping
-# or restarting a not-running service as well as the restart
-# with force-reload (in case signaling is not supported) are
-# considered a success.
-
-case "$1" in
- start)
- echo -n "Starting nginx "
- ## Start daemon with startproc(8). If this fails
- ## the return value is set appropriately by startproc.
- /sbin/startproc $NGINX_BIN
-
- # Remember status and be verbose
- rc_status -v
- ;;
- stop)
- echo -n "Shutting down nginx "
- ## Stop daemon with killproc(8) and if this fails
- ## killproc sets the return value according to LSB.
-
- /sbin/killproc -TERM $NGINX_BIN
-
- # Remember status and be verbose
- rc_status -v
- ;;
- try-restart|condrestart)
- ## Do a restart only if the service was active before.
- ## Note: try-restart is now part of LSB (as of 1.9).
- ## RH has a similar command named condrestart.
- if test "$1" = "condrestart"; then
- echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
- fi
- $0 status
- if test $? = 0; then
|
|
[-]
[+]
|
Deleted |
nginx.logrotate
^
|
| @@ -1,12 +0,0 @@
-/var/log/nginx/*log {
- daily
- rotate 10
- missingok
- notifempty
- compress
- sharedscripts
- postrotate
- [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
- endscript
-}
-
|
|
[-]
[+]
|
Deleted |
nginx.sysconfig
^
|
| @@ -1,5 +0,0 @@
-# Configuration file for the nginx service
-
-# set this to the location of the nginx configuration file
-NGINX_CONF_FILE=/etc/nginx/nginx.conf
-ulimit -n 512000
\ No newline at end of file
|
|
|
Deleted |
nginx_upstream_check_module-master.tar.gz
^
|
|
|
Deleted |
ngx_cache_purge.tar.gz
^
|
|
|
Deleted |
ngx_slowfs_cache-1.5.tar.gz
^
|
|
|
Deleted |
openssl-1.0.1j.tar.gz
^
|
|
|
Deleted |
poweredby.png
^
|
|
[-]
[+]
|
Deleted |
ssl-ciphersample
^
|
| @@ -1,3 +0,0 @@
-ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-ssl_ciphers EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:EECDH+RC4:RSA+RC4:!MD5;
-ssl_prefer_server_ciphers on;
|
|
[-]
[+]
|
Deleted |
ssl.conf
^
|
| @@ -1,24 +0,0 @@
-#
-# HTTPS server configuration
-#
-
-#server {
-# listen 443;
-# server_name _;
-
-# ssl on;
-# ssl_certificate cert.pem;
-# ssl_certificate_key cert.key;
-
-# ssl_session_timeout 5m;
-
-# ssl_protocols SSLv2 SSLv3 TLSv1;
-# ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
-# ssl_prefer_server_ciphers on;
-
-# location / {
-# root html;
-# index index.html index.htm;
-# }
-#}
-
|
|
[-]
[+]
|
Deleted |
upstream-fair.conf
^
|
| @@ -1,18 +0,0 @@
-#
-# This is a sample configuration to use the nginx-upstream-fair module
-# that is included.
-#
-# http://wiki.codemongers.com/NginxHttpUpstreamFairModule
-#
-# Change your Nginx config file's upstream block to include the 'fair'
-# directive:
-#
-
-# upstream mongrel {
-# fair;
-# server 127.0.0.1:5000;
-# server 127.0.0.1:5001;
-# server 127.0.0.1:5002;
-# }
-
-
|
|
[-]
[+]
|
Deleted |
virtual.conf
^
|
| @@ -1,15 +0,0 @@
-#
-# A virtual host using mix of IP-, name-, and port-based configuration
-#
-
-#server {
-# listen 8000;
-# listen somename:8080;
-# server_name somename alias another.alias;
-
-# location / {
-# root html;
-# index index.html index.htm;
-# }
-#}
-
|
