Compare commits
243 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ef40967cd2 | ||
|
f09169a288 | ||
|
7ed182cdd3 | ||
|
5c168fbc1c | ||
|
7cd8bf6ab9 | ||
|
80d334f680 | ||
|
2769972c79 | ||
|
0e8fc9c4a8 | ||
|
3630270cc9 | ||
|
a36353232d | ||
|
5806fd70eb | ||
|
4c725813a0 | ||
|
f8f18d5dc4 | ||
|
ddc12361e1 | ||
|
bcc32b6d95 | ||
|
8a38d38b97 | ||
|
f106fd919a | ||
|
221b2267d2 | ||
|
dc7e730037 | ||
|
3ba5cb0faa | ||
|
0c7690e709 | ||
|
447ae7f26a | ||
|
f1c10bd5e4 | ||
|
e4bc2afa65 | ||
|
9b08ea197b | ||
|
dc9dfb7a27 | ||
|
f0de5036a7 | ||
|
72036acd97 | ||
|
38fdeddda4 | ||
|
e9edae1e99 | ||
|
f935cbcf8d | ||
|
d1fd6c2b93 | ||
|
cdbbf72f9e | ||
|
4efda91377 | ||
|
2b53293757 | ||
|
bd726b71e5 | ||
|
a054f9a6cf | ||
|
58b4d7a8fd | ||
|
11ad27c4bf | ||
|
c4a17e68d1 | ||
|
d62a4ee6ef | ||
|
b589a2b452 | ||
|
2ebd7fd66c | ||
|
18d2380814 | ||
|
8e14a8bd23 | ||
|
078d1528aa | ||
|
d8c792dc0b | ||
|
454b523fb3 | ||
|
ec48d4f272 | ||
|
5b82bd77ff | ||
|
d99d389f9e | ||
|
0db4756fd4 | ||
|
4ee79c10a6 | ||
|
965b79921b | ||
|
69059b4dc3 | ||
|
f6d36b38b6 | ||
|
9f9495a675 | ||
|
9332102b2f | ||
|
c5387f873a | ||
|
6197fb76b0 | ||
|
d506d2d3cb | ||
|
542b7d78b2 | ||
|
aee3ca3ef3 | ||
|
f3985e2813 | ||
|
d1e632cb3e | ||
|
c6a3d4500d | ||
|
673d397dc2 | ||
|
13852f8c1b | ||
|
e1a5a9a231 | ||
|
a916571f13 | ||
|
692c6c0e5c | ||
|
57a15b5525 | ||
|
265c4d9942 | ||
|
3bf1078071 | ||
|
1ccfe82706 | ||
|
2954ce45e3 | ||
|
e7b50e7367 | ||
|
8c0bd096bf | ||
|
e84610bb0d | ||
|
136d59e4d3 | ||
|
f6939eb062 | ||
|
2059dfa9b7 | ||
|
37ad8df703 | ||
|
5ec8cd647d | ||
|
fcb7e6e1cb | ||
|
59a2189446 | ||
|
35afe2691e | ||
|
a5d1adbbb2 | ||
|
f9c3fc84f1 | ||
|
c90a743b30 | ||
|
ff1f65a66b | ||
|
23177a52db | ||
|
fd83cdf9b2 | ||
|
7060a8816a | ||
|
717eb870c8 | ||
|
3977c1884e | ||
|
72706a4189 | ||
|
8ce940ba30 | ||
|
2260d65fbc | ||
|
b9d488c0e4 | ||
|
a8ec9671db | ||
|
0f695d477b | ||
|
cd3634a6a5 | ||
|
b715d5706f | ||
|
580389d469 | ||
|
5ce679587a | ||
|
15381ee6a4 | ||
|
ead84e8147 | ||
|
3c05540756 | ||
|
22474267e4 | ||
|
c1b72d22e2 | ||
|
563206b1de | ||
|
68a715e76d | ||
|
909926071d | ||
|
6d8e9ba363 | ||
|
cdada04db2 | ||
|
d639320127 | ||
|
149abb601c | ||
|
03809ae464 | ||
|
923d7af045 | ||
|
14377bb60f | ||
|
4bafbd1788 | ||
|
78b11f8ceb | ||
|
4dc02a17b8 | ||
|
8d1199dc1a | ||
|
88a0f4a6f1 | ||
|
5892e54ae9 | ||
|
819034d98e | ||
|
ba7509ae8c | ||
|
d6fe0bb232 | ||
|
c7f280bb4b | ||
|
d86a02dac3 | ||
|
ed8afe3dd1 | ||
|
9adfe1e04b | ||
|
3b7868d369 | ||
|
e3378d78e4 | ||
|
6ab709a7eb | ||
|
ba5e503c9a | ||
|
790674dc4a | ||
|
24a9355337 | ||
|
84b0cb93c6 | ||
|
934d6046fa | ||
|
8f91f185c5 | ||
|
fc9c813ccc | ||
|
88e7aec1b1 | ||
|
3c10ed06a9 | ||
|
5a305d683a | ||
|
9cbbeeb8bf | ||
|
2d20b78566 | ||
|
f181109e9a | ||
|
6166551fc5 | ||
|
7d51f58419 | ||
|
9fc9ff2637 | ||
|
d7b6d7c0a6 | ||
|
b55cfc23dd | ||
|
39dbfbd198 | ||
|
c20a402e83 | ||
|
74d92ab976 | ||
|
cbdefbd6bb | ||
|
8370461027 | ||
|
7b9ca4a9d9 | ||
|
6267fca680 | ||
|
eed161fdbd | ||
|
3d430736cc | ||
|
45ce8ed829 | ||
|
798515d25e | ||
|
ef2548d3c2 | ||
|
4784dce4d2 | ||
|
647570bf72 | ||
|
52cc859183 | ||
|
9e462b8455 | ||
|
0b5a896201 | ||
|
501734eb99 | ||
|
4f8de83470 | ||
|
eea47d5274 | ||
|
04fa560d99 | ||
|
64543c846d | ||
|
f1b5ba4e3a | ||
|
71daa2443f | ||
|
48bb9f19f4 | ||
|
966d9b741e | ||
|
ae0c321445 | ||
|
735b120360 | ||
|
7137e03771 | ||
|
044f0c963b | ||
|
a8fed5fed1 | ||
|
ff6cf912db | ||
|
08e01611bb | ||
|
a358587bd1 | ||
|
e456d9d30d | ||
|
fbdf34d7d8 | ||
|
51d5ebf2d4 | ||
|
b021904263 | ||
|
681f8d4469 | ||
|
3574932a18 | ||
|
3ab920f160 | ||
|
5344b15eca | ||
|
13cf02b3fc | ||
|
705eb45a19 | ||
|
5de04bf349 | ||
|
6380c10e5a | ||
|
8a97985f4d | ||
|
129b0f3a23 | ||
|
669abfd1c4 | ||
|
4cdcd0ccc3 | ||
|
83f14e42cb | ||
|
ee9a369c6e | ||
|
8e04e8e62a | ||
|
a6548afc97 | ||
|
c89e267a4e | ||
|
516ea18ba1 | ||
|
a28f6d63b2 | ||
|
6afa9eb88e | ||
|
745db4a203 | ||
|
cd4c95c6d2 | ||
|
58a32dc9bf | ||
|
88163e421d | ||
|
9db79625de | ||
|
09cc4a5d2f | ||
|
35391dc60a | ||
|
39cb145d5e | ||
|
df45591853 | ||
|
c9d5196d10 | ||
|
ab9c337f9b | ||
|
f172741083 | ||
|
1c673dcb63 | ||
|
d47e29b903 | ||
|
ec8d40bf99 | ||
|
2f134d1fc1 | ||
|
5f097085b6 | ||
|
4fd18896ff | ||
|
c4e0545329 | ||
|
3faabfd8be | ||
|
1ba8dc95f8 | ||
|
0bd6a91591 | ||
|
9f868d6d47 | ||
|
55f191dfb9 | ||
|
e0428c4a1d | ||
|
18f9a56580 | ||
|
1fb1d8ecb2 | ||
|
295723bfed | ||
|
fdc25de70b | ||
|
c6fb7f86b9 |
@ -1 +0,0 @@
|
|||||||
nginx-0.6.36.tar.gz
|
|
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
8
.gitignore
vendored
Normal file
8
.gitignore
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
*~
|
||||||
|
nginx*/
|
||||||
|
x86_64/
|
||||||
|
.*.log
|
||||||
|
*swp
|
||||||
|
*.rpm
|
||||||
|
/nginx-*.tar.gz
|
||||||
|
/nginx-*.tar.gz.asc
|
31
0001-remove-Werror-in-upstream-build-scripts.patch
Normal file
31
0001-remove-Werror-in-upstream-build-scripts.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 00cab63102084b89de0a3494a1d023c4b1d4982b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felix Kaechele <felix@kaechele.ca>
|
||||||
|
Date: Sun, 7 Jun 2020 12:14:02 -0400
|
||||||
|
Subject: [PATCH 1/2] remove Werror in upstream build scripts
|
||||||
|
|
||||||
|
removes -Werror in upstream build scripts. -Werror conflicts with
|
||||||
|
-D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
||||||
|
|
||||||
|
Signed-off-by: Felix Kaechele <felix@kaechele.ca>
|
||||||
|
---
|
||||||
|
auto/cc/gcc | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/auto/cc/gcc b/auto/cc/gcc
|
||||||
|
index a5c5c18..cdbbadb 100644
|
||||||
|
--- a/auto/cc/gcc
|
||||||
|
+++ b/auto/cc/gcc
|
||||||
|
@@ -166,7 +166,9 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
108
0002-fix-PIDFile-handling.patch
Normal file
108
0002-fix-PIDFile-handling.patch
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
From 62470498cca9a209aa9904668c1949f5229123af Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felix Kaechele <felix@kaechele.ca>
|
||||||
|
Date: Tue, 20 Apr 2021 21:28:18 -0400
|
||||||
|
Subject: [PATCH 2/2] fix PIDFile handling
|
||||||
|
|
||||||
|
Corresponding RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1869026
|
||||||
|
|
||||||
|
Rejected upstream: https://trac.nginx.org/nginx/ticket/1897
|
||||||
|
|
||||||
|
Taken from: https://git.launchpad.net/ubuntu/+source/nginx/tree/debian/patches/nginx-fix-pidfile.patch
|
||||||
|
|
||||||
|
From original patch:
|
||||||
|
Author: Tj <ubuntu@iam.tj>
|
||||||
|
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864
|
||||||
|
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876365
|
||||||
|
iLast-Update: 2020-06-24
|
||||||
|
|
||||||
|
Signed-off-by: Felix Kaechele <felix@kaechele.ca>
|
||||||
|
---
|
||||||
|
src/core/nginx.c | 24 +++++++++++++++++++++---
|
||||||
|
src/os/unix/ngx_daemon.c | 8 ++++++--
|
||||||
|
2 files changed, 27 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/core/nginx.c b/src/core/nginx.c
|
||||||
|
index 48a20e9..32c0afe 100644
|
||||||
|
--- a/src/core/nginx.c
|
||||||
|
+++ b/src/core/nginx.c
|
||||||
|
@@ -339,14 +339,21 @@ main(int argc, char *const *argv)
|
||||||
|
ngx_process = NGX_PROCESS_MASTER;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* tell-tale to detect if this is parent or child process */
|
||||||
|
+ ngx_int_t child_pid = NGX_BUSY;
|
||||||
|
+
|
||||||
|
#if !(NGX_WIN32)
|
||||||
|
|
||||||
|
if (ngx_init_signals(cycle->log) != NGX_OK) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* tell-tale that this code has been executed */
|
||||||
|
+ child_pid--;
|
||||||
|
+
|
||||||
|
if (!ngx_inherited && ccf->daemon) {
|
||||||
|
- if (ngx_daemon(cycle->log) != NGX_OK) {
|
||||||
|
+ child_pid = ngx_daemon(cycle->log);
|
||||||
|
+ if (child_pid == NGX_ERROR) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -359,8 +366,19 @@ main(int argc, char *const *argv)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
|
||||||
|
- return 1;
|
||||||
|
+ /* If ngx_daemon() returned the child's PID in the parent process
|
||||||
|
+ * after the fork() set ngx_pid to the child_pid, which gets
|
||||||
|
+ * written to the PID file, then exit.
|
||||||
|
+ * For NGX_WIN32 always write the PID file
|
||||||
|
+ * For others, only write it from the parent process */
|
||||||
|
+ if (child_pid < NGX_OK || child_pid > NGX_OK) {
|
||||||
|
+ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid;
|
||||||
|
+ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (child_pid > NGX_OK) {
|
||||||
|
+ exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
|
||||||
|
diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
|
||||||
|
index 385c49b..3719854 100644
|
||||||
|
--- a/src/os/unix/ngx_daemon.c
|
||||||
|
+++ b/src/os/unix/ngx_daemon.c
|
||||||
|
@@ -7,14 +7,17 @@
|
||||||
|
|
||||||
|
#include <ngx_config.h>
|
||||||
|
#include <ngx_core.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
|
||||||
|
ngx_int_t
|
||||||
|
ngx_daemon(ngx_log_t *log)
|
||||||
|
{
|
||||||
|
int fd;
|
||||||
|
+ /* retain the return value for passing back to caller */
|
||||||
|
+ pid_t pid_child = fork();
|
||||||
|
|
||||||
|
- switch (fork()) {
|
||||||
|
+ switch (pid_child) {
|
||||||
|
case -1:
|
||||||
|
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
|
||||||
|
return NGX_ERROR;
|
||||||
|
@@ -23,7 +26,8 @@ ngx_daemon(ngx_log_t *log)
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
- exit(0);
|
||||||
|
+ /* let caller do the exit() */
|
||||||
|
+ return pid_child;
|
||||||
|
}
|
||||||
|
|
||||||
|
ngx_parent = ngx_pid;
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
4
404.html
4
404.html
@ -105,12 +105,12 @@
|
|||||||
|
|
||||||
<div class="logos">
|
<div class="logos">
|
||||||
<a href="http://nginx.net/"><img
|
<a href="http://nginx.net/"><img
|
||||||
src="nginx-logo.png"
|
src="/nginx-logo.png"
|
||||||
alt="[ Powered by nginx ]"
|
alt="[ Powered by nginx ]"
|
||||||
width="121" height="32" /></a>
|
width="121" height="32" /></a>
|
||||||
|
|
||||||
<a href="http://fedoraproject.org/"><img
|
<a href="http://fedoraproject.org/"><img
|
||||||
src="poweredby.png"
|
src="/poweredby.png"
|
||||||
alt="[ Powered by Fedora ]"
|
alt="[ Powered by Fedora ]"
|
||||||
width="88" height="31" /></a>
|
width="88" height="31" /></a>
|
||||||
</div>
|
</div>
|
||||||
|
4
50x.html
4
50x.html
@ -105,12 +105,12 @@
|
|||||||
|
|
||||||
<div class="logos">
|
<div class="logos">
|
||||||
<a href="http://nginx.net/"><img
|
<a href="http://nginx.net/"><img
|
||||||
src="nginx-logo.png"
|
src="/nginx-logo.png"
|
||||||
alt="[ Powered by nginx ]"
|
alt="[ Powered by nginx ]"
|
||||||
width="121" height="32" /></a>
|
width="121" height="32" /></a>
|
||||||
|
|
||||||
<a href="http://fedoraproject.org/"><img
|
<a href="http://fedoraproject.org/"><img
|
||||||
src="poweredby.png"
|
src="/poweredby.png"
|
||||||
alt="[ Powered by Fedora ]"
|
alt="[ Powered by Fedora ]"
|
||||||
width="88" height="31" /></a>
|
width="88" height="31" /></a>
|
||||||
</div>
|
</div>
|
||||||
|
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
|||||||
# Makefile for source rpm: nginx
|
|
||||||
# $Id$
|
|
||||||
NAME := nginx
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
define find-makefile-common
|
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|
||||||
|
|
||||||
ifeq ($(MAKEFILE_COMMON),)
|
|
||||||
# attept a checkout
|
|
||||||
define checkout-makefile-common
|
|
||||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MAKEFILE_COMMON)
|
|
20
README.dynamic
Normal file
20
README.dynamic
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
###############
|
||||||
|
Dynamic modules
|
||||||
|
###############
|
||||||
|
|
||||||
|
Dynamic modules are loaded using the "load_modules" directive. The RPM package
|
||||||
|
for each module has a '.conf' file in the /usr/share/nginx/modules directory.
|
||||||
|
The '.conf' file contains a single "load_modules" directive.
|
||||||
|
|
||||||
|
This means that whenever a new dynamic module is installed, it will
|
||||||
|
automatically be enabled and Nginx will be reloaded.
|
||||||
|
|
||||||
|
--------------------------------------------------------
|
||||||
|
Prevent dynamic modules from being enabled automatically
|
||||||
|
--------------------------------------------------------
|
||||||
|
|
||||||
|
You may want to avoid dynamic modules being enabled automatically. Simply
|
||||||
|
remove this line from the top of /etc/nginx/nginx.conf:
|
||||||
|
|
||||||
|
include /usr/share/nginx/modules/*.conf;
|
||||||
|
|
88
UPGRADE-NOTES-1.6-to-1.10
Normal file
88
UPGRADE-NOTES-1.6-to-1.10
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
#############
|
||||||
|
Upgrade notes
|
||||||
|
#############
|
||||||
|
|
||||||
|
To resolve numerous security flaws, the nginx package was updated to 1.10.x.
|
||||||
|
|
||||||
|
You should review your configuration files in /etc/nginx to determine if there
|
||||||
|
are any incompatibilities. Below is a summary of the main incompatible changes.
|
||||||
|
Some nginx directives have been changed or removed, so you may need to modify
|
||||||
|
your configuration.
|
||||||
|
|
||||||
|
Please see upstream release notes for a complete list of new features,
|
||||||
|
bug fixes, and changes: http://nginx.org/en/CHANGES-1.10
|
||||||
|
One notable feature is support for HTTP/2.
|
||||||
|
|
||||||
|
Nginx gained support for dynamic modules. As part of this update, dynamic
|
||||||
|
modules have been split into subpackages. For the time being these are hard
|
||||||
|
dependencies to aid the upgrade path. When you install nginx, all of these
|
||||||
|
modules are installed and enabled by default:
|
||||||
|
- nginx-mod-http-geoip
|
||||||
|
- nginx-mod-http-image-filter
|
||||||
|
- nginx-mod-http-perl
|
||||||
|
- nginx-mod-http-xslt-filter
|
||||||
|
- nginx-mod-mail
|
||||||
|
- nginx-mod-stream
|
||||||
|
|
||||||
|
Changes with nginx 1.10.x
|
||||||
|
|
||||||
|
*) Change: non-idempotent requests (POST, LOCK, PATCH) are no longer
|
||||||
|
passed to the next server by default if a request has been sent to a
|
||||||
|
backend; the "non_idempotent" parameter of the "proxy_next_upstream"
|
||||||
|
directive explicitly allows retrying such requests.
|
||||||
|
|
||||||
|
*) Change: now the "output_buffers" directive uses two buffers by
|
||||||
|
default.
|
||||||
|
|
||||||
|
*) Change: now nginx limits subrequests recursion, not simultaneous
|
||||||
|
subrequests.
|
||||||
|
|
||||||
|
*) Change: now nginx checks the whole cache key when returning a
|
||||||
|
response from cache.
|
||||||
|
Thanks to Gena Makhomed and Sergey Brester.
|
||||||
|
|
||||||
|
*) Change: the "proxy_downstream_buffer" and "proxy_upstream_buffer"
|
||||||
|
directives of the stream module are replaced with the
|
||||||
|
"proxy_buffer_size" directive.
|
||||||
|
|
||||||
|
*) Change: duplicate "http", "mail", and "stream" blocks are now
|
||||||
|
disallowed.
|
||||||
|
|
||||||
|
*) Change: now SSLv3 protocol is disabled by default.
|
||||||
|
|
||||||
|
*) Change: some long deprecated directives are not supported anymore.
|
||||||
|
|
||||||
|
*) Change: obsolete aio and rtsig event methods have been removed.
|
||||||
|
|
||||||
|
Changes with nginx 1.8.x
|
||||||
|
|
||||||
|
*) Change: the "sendfile" parameter of the "aio" directive is
|
||||||
|
deprecated; now nginx automatically uses AIO to pre-load data for
|
||||||
|
sendfile if both "aio" and "sendfile" directives are used.
|
||||||
|
|
||||||
|
*) Change: now the "If-Modified-Since", "If-Range", etc. client request
|
||||||
|
header lines are passed to a backend while caching if nginx knows in
|
||||||
|
advance that the response will not be cached (e.g., when using
|
||||||
|
proxy_cache_min_uses).
|
||||||
|
|
||||||
|
*) Change: now after proxy_cache_lock_timeout nginx sends a request to a
|
||||||
|
backend with caching disabled; the new directives
|
||||||
|
"proxy_cache_lock_age", "fastcgi_cache_lock_age",
|
||||||
|
"scgi_cache_lock_age", and "uwsgi_cache_lock_age" specify a time
|
||||||
|
after which the lock will be released and another attempt to cache a
|
||||||
|
response will be made.
|
||||||
|
|
||||||
|
*) Change: the "log_format" directive can now be used only at http
|
||||||
|
level.
|
||||||
|
|
||||||
|
*) Change: now nginx takes into account the "Vary" header line in a
|
||||||
|
backend response while caching.
|
||||||
|
|
||||||
|
*) Change: the deprecated "limit_zone" directive is not supported
|
||||||
|
anymore.
|
||||||
|
|
||||||
|
*) Change: now the "stub_status" directive does not require a parameter.
|
||||||
|
|
||||||
|
*) Change: URI escaping now uses uppercase hexadecimal digits.
|
||||||
|
Thanks to Piotr Sikora.
|
||||||
|
|
565
changelog
Normal file
565
changelog
Normal file
@ -0,0 +1,565 @@
|
|||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.22.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Oct 19 2022 Felix Kaechele <felix@kaechele.ca> - 1:1.22.1-1
|
||||||
|
- update 1.22.1
|
||||||
|
- build against OpenSSL 3 on EL8
|
||||||
|
- enable kTLS support
|
||||||
|
|
||||||
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.22.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 27 2022 Luboš Uhliarik <luhliari@redhat.com> - 1:1.22.0-3
|
||||||
|
- Fix nginx downgrade issue after introducing core sub-package
|
||||||
|
|
||||||
|
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.22.0-2
|
||||||
|
- Perl 5.36 rebuild
|
||||||
|
|
||||||
|
* Wed May 25 2022 Felix Kaechele <heffer@fedoraproject.org> - 1:1.22.0-1
|
||||||
|
- update to 1.22.0
|
||||||
|
- switch to pcre2
|
||||||
|
- drop CVE-2021-3618 patch, it's upstreamed
|
||||||
|
- add signing key of Konstantin Pavlov
|
||||||
|
- add stream_geoip_module and stream_realip_module
|
||||||
|
|
||||||
|
* Thu Mar 24 2022 Honza Horak <hhorak@redhat.com> - 1:1.20.2-4
|
||||||
|
- Introduce core sub-package for having a daemon only with a minimal footprint
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.20.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Dec 17 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.2-1
|
||||||
|
- update to 1.20.2
|
||||||
|
|
||||||
|
* Mon Oct 18 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.1-9
|
||||||
|
- fix installation of nginxmods.attr for EPEL 7
|
||||||
|
|
||||||
|
* Mon Oct 18 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.1-8
|
||||||
|
- Fix "file size changed while zipping" when rotating logs (rhbz#1980948,2015249,2015243)
|
||||||
|
|
||||||
|
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1:1.20.1-7
|
||||||
|
- Rebuilt with OpenSSL 3.0.0
|
||||||
|
|
||||||
|
* Tue Aug 10 2021 Neal Gompa <ngompa@datto.com> - 1:1.20.1-6
|
||||||
|
- Add -mod-devel subpackage for building external nginx modules (rhbz#1989778)
|
||||||
|
|
||||||
|
* Mon Aug 09 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-5
|
||||||
|
- Add symlink used by system-logos-httpd
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.20.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 25 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.1-3
|
||||||
|
- fix for CVE-2021-3618 (rhbz#1975651)
|
||||||
|
|
||||||
|
* Tue Jun 01 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.1-2
|
||||||
|
- use different fix for rhbz#1683388 as it introduced permissions issues in 1:1.20.0-2
|
||||||
|
|
||||||
|
* Tue May 25 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.1-1
|
||||||
|
- update to 1.20.1 (fixes CVE-2021-23017)
|
||||||
|
|
||||||
|
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.20.0-4
|
||||||
|
- Perl 5.34 rebuild
|
||||||
|
|
||||||
|
* Fri Apr 30 2021 Lubos Uhliarik <luhliari@redhat.com> - 1:1.20.0-3
|
||||||
|
- Related: #1636235 - centralizing default index.html on nginx
|
||||||
|
|
||||||
|
* Wed Apr 21 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.0-2
|
||||||
|
- sync rawhide and EPEL7 spec files again
|
||||||
|
- systemd service reload now checks config file (rhbz#1565377)
|
||||||
|
- drop nginx requirement on nginx-all-modules (rhbz#1708799)
|
||||||
|
- let nginx handle log creation on logrotate (rhbz#1683388)
|
||||||
|
- have log directory owned by root (rhbz#1390183, CVE-2016-1247)
|
||||||
|
- remove obsolete --with-ipv6 (src PR#8)
|
||||||
|
- correction: pcre2 is actually not supported by nginx, reintroduce pcre
|
||||||
|
|
||||||
|
* Wed Apr 21 2021 Felix Kaechele <heffer@fedoraproject.org> - 1:1.20.0-1
|
||||||
|
- update to 1.20.0
|
||||||
|
- sync with mainline spec file
|
||||||
|
- order configure options alphabetically for easier comparinggit
|
||||||
|
- add --with-compat option (rhbz#1834452)
|
||||||
|
- add patch to fix PIDFile race condition (rhbz#1869026)
|
||||||
|
- use pcre2 instead of pcre (rhbz#1938984)
|
||||||
|
- add Wants=network-online.target to systemd unit (rhbz#1943779)
|
||||||
|
|
||||||
|
* Mon Feb 22 2021 Lubos Uhliarik <luhliari@redhat.com> - 1:1.18.0-5
|
||||||
|
- Resolves: #1931402 - drop gperftools module
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.18.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.18.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.18.0-2
|
||||||
|
- Perl 5.32 rebuild
|
||||||
|
|
||||||
|
* Fri Apr 24 2020 Felix Kaechele <heffer@fedoraproject.org> - 1:1.18.0-1
|
||||||
|
- Update to 1.18.0
|
||||||
|
- Increased types_hash_max_size to 4096 in default config
|
||||||
|
- Add gpg source verification
|
||||||
|
- Add Recommends: logrotate
|
||||||
|
- Drop location / from default config (rhbz#1564768)
|
||||||
|
- Drop default_sever from default config (rhbz#1373822)
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.16.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Sep 15 2019 Warren Togami <warren@blockstream.com>
|
||||||
|
- add conditionals for EPEL7, see rhbz#1750857
|
||||||
|
|
||||||
|
* Tue Aug 13 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.1-1
|
||||||
|
- Update to upstream release 1.16.1
|
||||||
|
- Fixes CVE-2019-9511, CVE-2019-9513, CVE-2019-9516
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.16.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.16.0-4
|
||||||
|
- Perl 5.30 rebuild
|
||||||
|
|
||||||
|
* Tue May 14 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.16.0-3
|
||||||
|
- Move to common default index.html
|
||||||
|
- Resolves: rhbz#1636235
|
||||||
|
|
||||||
|
* Tue May 07 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.0-2
|
||||||
|
- Add missing directory for vim plugin
|
||||||
|
|
||||||
|
* Fri Apr 26 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.0-1
|
||||||
|
- Update to upstream release 1.16.0
|
||||||
|
|
||||||
|
* Mon Mar 04 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.15.9-1
|
||||||
|
- Update to upstream release 1.15.9
|
||||||
|
- Enable ngx_stream_ssl_preread module
|
||||||
|
- Remove redundant conditionals
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.14.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1:1.14.1-4
|
||||||
|
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||||
|
|
||||||
|
* Tue Dec 11 2018 Joe Orton <jorton@redhat.com> - 1:1.14.1-3
|
||||||
|
- fix unexpanded paths in nginx(8)
|
||||||
|
|
||||||
|
* Tue Nov 20 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.14.1-2
|
||||||
|
- new version 1.14.1
|
||||||
|
- Resolves: #1584426 - Upstream Nginx 1.14.0 is now available
|
||||||
|
- Resolves: #1647255 - CVE-2018-16845 nginx: Denial of service and memory
|
||||||
|
disclosure via mp4 module
|
||||||
|
- Resolves: #1647259 - CVE-2018-16843 nginx: Excessive memory consumption
|
||||||
|
via flaw in HTTP/2 implementation
|
||||||
|
- Resolves: #1647258 - CVE-2018-16844 nginx: Excessive CPU usage via flaw
|
||||||
|
in HTTP/2 implementation
|
||||||
|
|
||||||
|
* Mon Aug 06 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-14
|
||||||
|
- add requires on perl(constant) for mod-http-perl
|
||||||
|
|
||||||
|
* Mon Jul 30 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-13
|
||||||
|
- don't build with geoip by default
|
||||||
|
|
||||||
|
* Thu Jul 19 2018 Joe Orton <jorton@redhat.com> - 1:1.12.1-12
|
||||||
|
- add build conditional for geoip support
|
||||||
|
|
||||||
|
* Mon Jul 16 2018 Tadej Janež <tadej.j@nez.si> - 1:1.12.1-11
|
||||||
|
- Add gcc to BuildRequires to account for
|
||||||
|
https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.12.1-9
|
||||||
|
- Perl 5.28 rebuild
|
||||||
|
|
||||||
|
* Mon May 14 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-8
|
||||||
|
- Related: #1573942 - nginx fails on start
|
||||||
|
|
||||||
|
* Wed May 02 2018 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.1-7
|
||||||
|
- Resolves: #1573942 - nginx fails on start
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 24 2018 Björn Esser <besser82@fedoraproject.org> - 1:1.12.1-5
|
||||||
|
- Add patch to apply glibc bugfix if really needed only
|
||||||
|
- Disable strict symbol checks in the link editor
|
||||||
|
|
||||||
|
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 1:1.12.1-4
|
||||||
|
- Rebuilt for switch to libxcrypt
|
||||||
|
|
||||||
|
* Tue Oct 24 2017 Joe Orton <jorton@redhat.com> - 1:1.12.1-3
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Tue Sep 19 2017 Remi Collet <remi@fedoraproject.org> - 1:1.12.1-2
|
||||||
|
- own system drop-in directories #1493036
|
||||||
|
|
||||||
|
* Tue Aug 15 2017 Joe Orton <jorton@redhat.com> - 1:1.12.1-1
|
||||||
|
- update to 1.12.1 (#1469924)
|
||||||
|
- enable http_auth_request_module (Tim Niemueller, #1471106)
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.12.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.12.0-2
|
||||||
|
- Perl 5.26 rebuild
|
||||||
|
|
||||||
|
* Tue May 30 2017 Luboš Uhliarik <luhliari@redhat.com> - 1:1.12.0-1
|
||||||
|
- new version 1.12.0
|
||||||
|
|
||||||
|
* Wed Feb 8 2017 Joe Orton <jorton@redhat.com> - 1:1.10.3-1
|
||||||
|
- update to upstream release 1.10.3
|
||||||
|
|
||||||
|
* Mon Oct 31 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.10.2-1
|
||||||
|
- update to upstream release 1.10.2
|
||||||
|
|
||||||
|
* Tue May 31 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.10.1-1
|
||||||
|
- update to upstream release 1.10.1
|
||||||
|
|
||||||
|
* Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.10.0-4
|
||||||
|
- Perl 5.24 rebuild
|
||||||
|
|
||||||
|
* Sun May 8 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:1.10.0-3
|
||||||
|
- Enable AIO on aarch64 (rhbz 1258414)
|
||||||
|
|
||||||
|
* Wed Apr 27 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.10.0-2
|
||||||
|
- only Require nginx-all-modules for EPEL and current Fedora releases
|
||||||
|
|
||||||
|
* Wed Apr 27 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.10.0-1
|
||||||
|
- update to upstream release 1.10.0
|
||||||
|
- split dynamic modules into subpackages
|
||||||
|
- spec file cleanup
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 26 2016 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.1-1
|
||||||
|
- update to upstream release 1.8.1
|
||||||
|
- CVE-2016-0747: Insufficient limits of CNAME resolution in resolver
|
||||||
|
- CVE-2016-0746: Use-after-free during CNAME response processing in resolver
|
||||||
|
- CVE-2016-0742: Invalid pointer dereference in resolver
|
||||||
|
|
||||||
|
* Sun Oct 04 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-14
|
||||||
|
- consistently use '%%global with_foo' style of logic
|
||||||
|
- remove PID file before starting nginx (#1268621)
|
||||||
|
|
||||||
|
* Fri Sep 25 2015 Ville Skyttä <ville.skytta@iki.fi> - 1:1.8.0-13
|
||||||
|
- Use nginx-mimetypes from mailcap (#1248736)
|
||||||
|
- Mark LICENSE as %%license
|
||||||
|
|
||||||
|
* Thu Sep 10 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-12
|
||||||
|
- also build with gperftools on aarch64 (#1258412)
|
||||||
|
|
||||||
|
* Wed Aug 12 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1:1.8.0-11
|
||||||
|
- nginx.conf: added commented-out SSL configuration directives (#1179232)
|
||||||
|
|
||||||
|
* Fri Jul 03 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-10
|
||||||
|
- switch back to /bin/kill in logrotate script due to SELinux denials
|
||||||
|
|
||||||
|
* Tue Jun 16 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-9
|
||||||
|
- fix path to png in error pages (#1232277)
|
||||||
|
- optimize png images with optipng
|
||||||
|
|
||||||
|
* Sun Jun 14 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-8
|
||||||
|
- replace /bin/kill with /usr/bin/systemctl kill in logrotate script (#1231543)
|
||||||
|
- remove After=syslog.target in nginx.service (#1231543)
|
||||||
|
- replace ExecStop with KillSignal=SIGQUIT in nginx.service (#1231543)
|
||||||
|
|
||||||
|
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.8.0-7
|
||||||
|
- Perl 5.22 rebuild
|
||||||
|
|
||||||
|
* Sun May 10 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-6
|
||||||
|
- revert previous change
|
||||||
|
|
||||||
|
* Sun May 10 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-5
|
||||||
|
- move default server to default.conf (#1220094)
|
||||||
|
|
||||||
|
* Sun May 10 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-4
|
||||||
|
- add TimeoutStopSec=5 and KillMode=mixed to nginx.service
|
||||||
|
- set worker_processes to auto
|
||||||
|
- add some common options to the http block in nginx.conf
|
||||||
|
- run nginx-upgrade on package update
|
||||||
|
- remove some redundant scriptlet commands
|
||||||
|
- listen on ipv6 for default server (#1217081)
|
||||||
|
|
||||||
|
* Wed Apr 22 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-3
|
||||||
|
- improve nginx-upgrade script
|
||||||
|
|
||||||
|
* Wed Apr 22 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-2
|
||||||
|
- add --with-pcre-jit
|
||||||
|
|
||||||
|
* Wed Apr 22 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.8.0-1
|
||||||
|
- update to upstream release 1.8.0
|
||||||
|
|
||||||
|
* Thu Apr 09 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.7.12-1
|
||||||
|
- update to upstream release 1.7.12
|
||||||
|
|
||||||
|
* Sun Feb 15 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.7.10-1
|
||||||
|
- update to upstream release 1.7.10
|
||||||
|
- remove systemd conditionals
|
||||||
|
|
||||||
|
* Wed Oct 22 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-4
|
||||||
|
- fix package ownership of directories
|
||||||
|
|
||||||
|
* Wed Oct 22 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-3
|
||||||
|
- add vim files (#1142849)
|
||||||
|
|
||||||
|
* Mon Sep 22 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-2
|
||||||
|
- create nginx-filesystem subpackage (patch from Remi Collet)
|
||||||
|
- create /etc/nginx/default.d as a drop-in directory for configuration files
|
||||||
|
for the default server block
|
||||||
|
- clean up nginx.conf
|
||||||
|
|
||||||
|
* Wed Sep 17 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-1
|
||||||
|
- update to upstream release 1.6.2
|
||||||
|
- CVE-2014-3616 nginx: virtual host confusion (#1142573)
|
||||||
|
|
||||||
|
* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.6.1-4
|
||||||
|
- Perl 5.20 rebuild
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.6.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Aug 05 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.1-2
|
||||||
|
- add logic for EPEL 7
|
||||||
|
|
||||||
|
* Tue Aug 05 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.1-1
|
||||||
|
- update to upstream release 1.6.1
|
||||||
|
- (#1126891) CVE-2014-3556: SMTP STARTTLS plaintext injection flaw
|
||||||
|
|
||||||
|
* Wed Jul 02 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1:1.6.0-3
|
||||||
|
- Fix FTBFS on aarch64 (#1115559)
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.6.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Apr 26 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.0-1
|
||||||
|
- update to upstream release 1.6.0
|
||||||
|
|
||||||
|
* Tue Mar 18 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.7-1
|
||||||
|
- update to upstream release 1.4.7
|
||||||
|
|
||||||
|
* Wed Mar 05 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.6-1
|
||||||
|
- update to upstream release 1.4.6
|
||||||
|
|
||||||
|
* Sun Feb 16 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.5-2
|
||||||
|
- avoid multiple index directives (#1065488)
|
||||||
|
|
||||||
|
* Sun Feb 16 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.5-1
|
||||||
|
- update to upstream release 1.4.5
|
||||||
|
|
||||||
|
* Wed Nov 20 2013 Peter Borsa <peter.borsa@gmail.com> - 1:1.4.4-1
|
||||||
|
- Update to upstream release 1.4.4
|
||||||
|
- Security fix BZ 1032267
|
||||||
|
|
||||||
|
* Sun Nov 03 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.3-1
|
||||||
|
- update to upstream release 1.4.3
|
||||||
|
|
||||||
|
* Fri Aug 09 2013 Jonathan Steffan <jsteffan@fedoraproject.org> - 1:1.4.2-3
|
||||||
|
- Add in conditionals to build for non-systemd targets
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 1:1.4.2-2
|
||||||
|
- Perl 5.18 rebuild
|
||||||
|
|
||||||
|
* Fri Jul 19 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.2-1
|
||||||
|
- update to upstream release 1.4.2
|
||||||
|
|
||||||
|
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1:1.4.1-3
|
||||||
|
- Perl 5.18 rebuild
|
||||||
|
|
||||||
|
* Tue Jun 11 2013 Remi Collet <rcollet@redhat.com> - 1:1.4.1-2
|
||||||
|
- rebuild for new GD 2.1.0
|
||||||
|
|
||||||
|
* Tue May 07 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.1-1
|
||||||
|
- update to upstream release 1.4.1 (#960605, #960606):
|
||||||
|
CVE-2013-2028 stack-based buffer overflow when handling certain chunked
|
||||||
|
transfer encoding requests
|
||||||
|
|
||||||
|
* Sun Apr 28 2013 Dan Horák <dan[at]danny.cz> - 1:1.4.0-2
|
||||||
|
- gperftools exist only on selected arches
|
||||||
|
|
||||||
|
* Fri Apr 26 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.4.0-1
|
||||||
|
- update to upstream release 1.4.0
|
||||||
|
- enable SPDY module (new in this version)
|
||||||
|
- enable http gunzip module (new in this version)
|
||||||
|
- enable google perftools module and add gperftools-devel to BR
|
||||||
|
- enable debugging (#956845)
|
||||||
|
- trim changelog
|
||||||
|
|
||||||
|
* Tue Apr 02 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.8-1
|
||||||
|
- update to upstream release 1.2.8
|
||||||
|
|
||||||
|
* Fri Feb 22 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.7-2
|
||||||
|
- make sure nginx directories are not world readable (#913724, #913735)
|
||||||
|
|
||||||
|
* Sat Feb 16 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.7-1
|
||||||
|
- update to upstream release 1.2.7
|
||||||
|
- add .asc file
|
||||||
|
|
||||||
|
* Tue Feb 05 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-6
|
||||||
|
- use 'kill' instead of 'systemctl' when rotating log files to workaround
|
||||||
|
SELinux issue (#889151)
|
||||||
|
|
||||||
|
* Wed Jan 23 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-5
|
||||||
|
- uncomment "include /etc/nginx/conf.d/*.conf by default but leave the
|
||||||
|
conf.d directory empty (#903065)
|
||||||
|
|
||||||
|
* Wed Jan 23 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-4
|
||||||
|
- add comment in nginx.conf regarding "include /etc/nginf/conf.d/*.conf"
|
||||||
|
(#903065)
|
||||||
|
|
||||||
|
* Wed Dec 19 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-3
|
||||||
|
- use correct file ownership when rotating log files
|
||||||
|
|
||||||
|
* Tue Dec 18 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-2
|
||||||
|
- send correct kill signal and use correct file permissions when rotating
|
||||||
|
log files (#888225)
|
||||||
|
- send correct kill signal in nginx-upgrade
|
||||||
|
|
||||||
|
* Tue Dec 11 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.6-1
|
||||||
|
- update to upstream release 1.2.6
|
||||||
|
|
||||||
|
* Sat Nov 17 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.5-1
|
||||||
|
- update to upstream release 1.2.5
|
||||||
|
|
||||||
|
* Sun Oct 28 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.4-1
|
||||||
|
- update to upstream release 1.2.4
|
||||||
|
- introduce new systemd-rpm macros (#850228)
|
||||||
|
- link to official documentation not the community wiki (#870733)
|
||||||
|
- do not run systemctl try-restart after package upgrade to allow the
|
||||||
|
administrator to run nginx-upgrade and avoid downtime
|
||||||
|
- add nginx man page (#870738)
|
||||||
|
- add nginx-upgrade man page and remove README.fedora
|
||||||
|
- remove chkconfig from Requires(post/preun)
|
||||||
|
- remove initscripts from Requires(preun/postun)
|
||||||
|
- remove separate configuration files in "/etc/nginx/conf.d" directory
|
||||||
|
and revert to upstream default of a centralized nginx.conf file
|
||||||
|
(#803635) (#842738)
|
||||||
|
|
||||||
|
* Fri Sep 21 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.3-1
|
||||||
|
- update to upstream release 1.2.3
|
||||||
|
|
||||||
|
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 28 2012 Petr Pisar <ppisar@redhat.com> - 1:1.2.1-2
|
||||||
|
- Perl 5.16 rebuild
|
||||||
|
|
||||||
|
* Sun Jun 10 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.1-1
|
||||||
|
- update to upstream release 1.2.1
|
||||||
|
|
||||||
|
* Fri Jun 08 2012 Petr Pisar <ppisar@redhat.com> - 1:1.2.0-2
|
||||||
|
- Perl 5.16 rebuild
|
||||||
|
|
||||||
|
* Wed May 16 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.2.0-1
|
||||||
|
- update to upstream release 1.2.0
|
||||||
|
|
||||||
|
* Wed May 16 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.15-4
|
||||||
|
- add nginx-upgrade to replace functionality from the nginx initscript
|
||||||
|
that was lost after migration to systemd
|
||||||
|
- add README.fedora to describe usage of nginx-upgrade
|
||||||
|
- nginx.logrotate: use built-in systemd kill command in postrotate script
|
||||||
|
- nginx.service: start after syslog.target and network.target
|
||||||
|
- nginx.service: remove unnecessary references to config file location
|
||||||
|
- nginx.service: use /bin/kill instead of "/usr/sbin/nginx -s" following
|
||||||
|
advice from nginx-devel
|
||||||
|
- nginx.service: use private /tmp
|
||||||
|
|
||||||
|
* Mon May 14 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.15-3
|
||||||
|
- fix incorrect postrotate script in nginx.logrotate
|
||||||
|
|
||||||
|
* Thu Apr 19 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.15-2
|
||||||
|
- renable auto-cc-gcc patch due to warnings on rawhide
|
||||||
|
|
||||||
|
* Sat Apr 14 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.15-1
|
||||||
|
- update to upstream release 1.0.15
|
||||||
|
- no need to apply auto-cc-gcc patch
|
||||||
|
- add %%global _hardened_build 1
|
||||||
|
|
||||||
|
* Thu Mar 15 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.14-1
|
||||||
|
- update to upstream release 1.0.14
|
||||||
|
- amend some %%changelog formatting
|
||||||
|
|
||||||
|
* Tue Mar 06 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.13-1
|
||||||
|
- update to upstream release 1.0.13
|
||||||
|
- amend --pid-path and --log-path
|
||||||
|
|
||||||
|
* Sun Mar 04 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.12-5
|
||||||
|
- change pid path in nginx.conf to match systemd service file
|
||||||
|
|
||||||
|
* Sun Mar 04 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.12-3
|
||||||
|
- fix %%pre scriptlet
|
||||||
|
|
||||||
|
* Mon Feb 20 2012 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.0.12-2
|
||||||
|
- update upstream URL
|
||||||
|
- replace %%define with %%global
|
||||||
|
- remove obsolete BuildRoot tag, %%clean section and %%defattr
|
||||||
|
- remove various unnecessary commands
|
||||||
|
- add systemd service file and update scriptlets
|
||||||
|
- add Epoch to accommodate %%triggerun as part of systemd migration
|
||||||
|
|
||||||
|
* Sun Feb 19 2012 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.0.12-1
|
||||||
|
- Update to 1.0.12
|
||||||
|
|
||||||
|
* Thu Nov 17 2011 Keiran "Affix" Smith <fedora@affix.me> - 1.0.10-1
|
||||||
|
- Bugfix: a segmentation fault might occur in a worker process if resolver got a big DNS response. Thanks to Ben Hawkes.
|
||||||
|
- Bugfix: in cache key calculation if internal MD5 implementation wasused; the bug had appeared in 1.0.4.
|
||||||
|
- Bugfix: the module ngx_http_mp4_module sent incorrect "Content-Length" response header line if the "start" argument was used. Thanks to Piotr Sikora.
|
||||||
|
|
||||||
|
* Thu Oct 27 2011 Keiran "Affix" Smith <fedora@affix.me> - 1.0.8-1
|
||||||
|
- Update to new 1.0.8 stable release
|
||||||
|
|
||||||
|
* Fri Aug 26 2011 Keiran "Affix" Smith <fedora@affix.me> - 1.0.5-1
|
||||||
|
- Update nginx to Latest Stable Release
|
||||||
|
|
||||||
|
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.0.0-3
|
||||||
|
- Perl mass rebuild
|
||||||
|
|
||||||
|
* Thu Jun 09 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.0.0-2
|
||||||
|
- Perl 5.14 mass rebuild
|
||||||
|
|
||||||
|
* Wed Apr 27 2011 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.0.0-1
|
||||||
|
- Update to 1.0.0
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.53-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Dec 12 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.8.53.5
|
||||||
|
- Extract out default config into its own file (bug #635776)
|
||||||
|
|
||||||
|
* Sun Dec 12 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.8.53-4
|
||||||
|
- Revert ownership of log dir
|
||||||
|
|
||||||
|
* Sun Dec 12 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.8.53-3
|
||||||
|
- Change ownership of /var/log/nginx to be 0700 nginx:nginx
|
||||||
|
- update init script to use killproc -p
|
||||||
|
- add reopen_logs command to init script
|
||||||
|
- update init script to use nginx -q option
|
||||||
|
|
||||||
|
* Sun Oct 31 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.8.53-2
|
||||||
|
- Fix linking of perl module
|
||||||
|
|
||||||
|
* Sun Oct 31 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.8.53-1
|
||||||
|
- Update to new stable 0.8.53
|
||||||
|
|
||||||
|
* Sat Jul 31 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.67-2
|
||||||
|
- add Provides: webserver (bug #619693)
|
||||||
|
|
||||||
|
* Sun Jun 20 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.67-1
|
||||||
|
- Update to new stable 0.7.67
|
||||||
|
- fix bugzilla #591543
|
||||||
|
|
||||||
|
* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.7.65-2
|
||||||
|
- Mass rebuild with perl-5.12.0
|
||||||
|
|
||||||
|
* Mon Feb 15 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.65-1
|
||||||
|
- Update to new stable 0.7.65
|
||||||
|
- change ownership of logdir to root:root
|
||||||
|
- add support for ipv6 (bug #561248)
|
||||||
|
- add random_index_module
|
||||||
|
- add secure_link_module
|
||||||
|
|
||||||
|
* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.64-1
|
||||||
|
- Update to new stable 0.7.64
|
116
index.html
116
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 Fedora</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 Fedora!</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
|
|
||||||
Fedora. 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 ]"
|
|
||||||
width="88" height="31" /></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
20
macros.nginxmods.in
Normal file
20
macros.nginxmods.in
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
%_nginx_abiversion @@NGINX_ABIVERSION@@
|
||||||
|
%_nginx_srcdir @@NGINX_SRCDIR@@
|
||||||
|
%_nginx_buildsrcdir nginx-src
|
||||||
|
%_nginx_modsrcdir ..
|
||||||
|
%_nginx_modbuilddir ../%{_vpath_builddir}
|
||||||
|
%nginx_moddir @@NGINX_MODDIR@@
|
||||||
|
%nginx_modconfdir @@NGINX_MODCONFDIR@@
|
||||||
|
|
||||||
|
%nginx_modrequires Requires: nginx(abi) = %{_nginx_abiversion}
|
||||||
|
|
||||||
|
%nginx_modconfigure(:-:) \\\
|
||||||
|
%undefine _strict_symbol_defs_build \
|
||||||
|
cp -a "%{_nginx_srcdir}" "%{_nginx_buildsrcdir}" \
|
||||||
|
cd "%{_nginx_buildsrcdir}" \
|
||||||
|
nginx_ldopts="$RPM_LD_FLAGS -Wl,-E" \
|
||||||
|
./configure --with-compat --with-cc-opt="%{optflags} $(pcre-config --cflags)" --with-ld-opt="$nginx_ldopts" \\\
|
||||||
|
--add-dynamic-module=$(realpath %{_nginx_modsrcdir}) --builddir=$(realpath %{_nginx_modbuilddir}) %{**} \
|
||||||
|
cd -
|
||||||
|
|
||||||
|
%nginx_modbuild %{__make} -C "%{_nginx_buildsrcdir}" %{_make_output_sync} %{?_smp_mflags} %{_make_verbose} modules
|
81
maxim.key
Normal file
81
maxim.key
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
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
|
||||||
|
=5smL
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
33
mdounin.key
Normal file
33
mdounin.key
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
Version: GnuPG v1.4.11 (FreeBSD)
|
||||||
|
|
||||||
|
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
|
||||||
|
=Tavt
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
@ -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"
|
|
157
nginx-conf.patch
157
nginx-conf.patch
@ -1,157 +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;
|
|
||||||
- # }
|
|
||||||
- #}
|
|
||||||
-
|
|
||||||
}
|
|
BIN
nginx-logo.png
BIN
nginx-logo.png
Binary file not shown.
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 368 B |
19
nginx-upgrade
Normal file
19
nginx-upgrade
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
[ ! -f /run/nginx.pid ] && exit 1
|
||||||
|
echo "Start new nginx master..."
|
||||||
|
/bin/systemctl kill --signal=SIGUSR2 nginx.service
|
||||||
|
sleep 5
|
||||||
|
[ ! -f /run/nginx.pid.oldbin ] && sleep 10
|
||||||
|
if [ ! -f /run/nginx.pid.oldbin ]; then
|
||||||
|
echo "Failed to start new nginx master."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Stop old nginx master gracefully..."
|
||||||
|
oldpid=`/usr/bin/cat /run/nginx.pid.oldbin 2>/dev/null`
|
||||||
|
/bin/kill -s QUIT $oldpid 2>/dev/null
|
||||||
|
sleep 5
|
||||||
|
[ -f /run/nginx.pid.oldbin ] && sleep 10
|
||||||
|
if [ -f /run/nginx.pid.oldbin ]; then
|
||||||
|
echo "Failed to stop old nginx master."
|
||||||
|
exit 1
|
||||||
|
fi
|
151
nginx-upgrade.8
Normal file
151
nginx-upgrade.8
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
|
||||||
|
.\"
|
||||||
|
.\" Standard preamble:
|
||||||
|
.\" ========================================================================
|
||||||
|
.de Sp \" Vertical space (when we can't use .PP)
|
||||||
|
.if t .sp .5v
|
||||||
|
.if n .sp
|
||||||
|
..
|
||||||
|
.de Vb \" Begin verbatim text
|
||||||
|
.ft CW
|
||||||
|
.nf
|
||||||
|
.ne \\$1
|
||||||
|
..
|
||||||
|
.de Ve \" End verbatim text
|
||||||
|
.ft R
|
||||||
|
.fi
|
||||||
|
..
|
||||||
|
.\" Set up some character translations and predefined strings. \*(-- will
|
||||||
|
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
|
||||||
|
.\" double quote, and \*(R" will give a right double quote. \*(C+ will
|
||||||
|
.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
|
||||||
|
.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
|
||||||
|
.\" nothing in troff, for use with C<>.
|
||||||
|
.tr \(*W-
|
||||||
|
.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
|
||||||
|
.ie n \{\
|
||||||
|
. ds -- \(*W-
|
||||||
|
. ds PI pi
|
||||||
|
. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
|
||||||
|
. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
|
||||||
|
. ds L" ""
|
||||||
|
. ds R" ""
|
||||||
|
. ds C` ""
|
||||||
|
. ds C' ""
|
||||||
|
'br\}
|
||||||
|
.el\{\
|
||||||
|
. ds -- \|\(em\|
|
||||||
|
. ds PI \(*p
|
||||||
|
. ds L" ``
|
||||||
|
. ds R" ''
|
||||||
|
'br\}
|
||||||
|
.\"
|
||||||
|
.\" Escape single quotes in literal strings from groff's Unicode transform.
|
||||||
|
.ie \n(.g .ds Aq \(aq
|
||||||
|
.el .ds Aq '
|
||||||
|
.\"
|
||||||
|
.\" If the F register is turned on, we'll generate index entries on stderr for
|
||||||
|
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
|
||||||
|
.\" entries marked with X<> in POD. Of course, you'll have to process the
|
||||||
|
.\" output yourself in some meaningful fashion.
|
||||||
|
.ie \nF \{\
|
||||||
|
. de IX
|
||||||
|
. tm Index:\\$1\t\\n%\t"\\$2"
|
||||||
|
..
|
||||||
|
. nr % 0
|
||||||
|
. rr F
|
||||||
|
.\}
|
||||||
|
.el \{\
|
||||||
|
. de IX
|
||||||
|
..
|
||||||
|
.\}
|
||||||
|
.\"
|
||||||
|
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
|
||||||
|
.\" Fear. Run. Save yourself. No user-serviceable parts.
|
||||||
|
. \" fudge factors for nroff and troff
|
||||||
|
.if n \{\
|
||||||
|
. ds #H 0
|
||||||
|
. ds #V .8m
|
||||||
|
. ds #F .3m
|
||||||
|
. ds #[ \f1
|
||||||
|
. ds #] \fP
|
||||||
|
.\}
|
||||||
|
.if t \{\
|
||||||
|
. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
|
||||||
|
. ds #V .6m
|
||||||
|
. ds #F 0
|
||||||
|
. ds #[ \&
|
||||||
|
. ds #] \&
|
||||||
|
.\}
|
||||||
|
. \" simple accents for nroff and troff
|
||||||
|
.if n \{\
|
||||||
|
. ds ' \&
|
||||||
|
. ds ` \&
|
||||||
|
. ds ^ \&
|
||||||
|
. ds , \&
|
||||||
|
. ds ~ ~
|
||||||
|
. ds /
|
||||||
|
.\}
|
||||||
|
.if t \{\
|
||||||
|
. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
|
||||||
|
. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
|
||||||
|
. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
|
||||||
|
. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
|
||||||
|
. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
|
||||||
|
. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
|
||||||
|
.\}
|
||||||
|
. \" troff and (daisy-wheel) nroff accents
|
||||||
|
.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
|
||||||
|
.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
|
||||||
|
.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
|
||||||
|
.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
|
||||||
|
.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
|
||||||
|
.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
|
||||||
|
.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
|
||||||
|
.ds ae a\h'-(\w'a'u*4/10)'e
|
||||||
|
.ds Ae A\h'-(\w'A'u*4/10)'E
|
||||||
|
. \" corrections for vroff
|
||||||
|
.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
|
||||||
|
.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
|
||||||
|
. \" for low resolution devices (crt and lpr)
|
||||||
|
.if \n(.H>23 .if \n(.V>19 \
|
||||||
|
\{\
|
||||||
|
. ds : e
|
||||||
|
. ds 8 ss
|
||||||
|
. ds o a
|
||||||
|
. ds d- d\h'-1'\(ga
|
||||||
|
. ds D- D\h'-1'\(hy
|
||||||
|
. ds th \o'bp'
|
||||||
|
. ds Th \o'LP'
|
||||||
|
. ds ae ae
|
||||||
|
. ds Ae AE
|
||||||
|
.\}
|
||||||
|
.rm #[ #] #H #V #F C
|
||||||
|
.\" ========================================================================
|
||||||
|
.\"
|
||||||
|
.IX Title "NGINX-UPGRADE 8"
|
||||||
|
.TH NGINX-UPGRADE 8 "2012-10-28" " " " "
|
||||||
|
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||||
|
.\" way too many mistakes in technical documents.
|
||||||
|
.if n .ad l
|
||||||
|
.nh
|
||||||
|
.SH "NAME"
|
||||||
|
nginx\-upgrade \- tool to upgrade nginx without any downtime
|
||||||
|
.SH "SYNOPSIS"
|
||||||
|
.IX Header "SYNOPSIS"
|
||||||
|
\&\fInginx-upgrade\fR
|
||||||
|
.SH "DESCRIPTION"
|
||||||
|
.IX Header "DESCRIPTION"
|
||||||
|
This downstream shell script updates nginx without any downtime. After
|
||||||
|
upgrading nginx via the package manager, running this script will create
|
||||||
|
a new nginx master. This master takes over all new requests. The old
|
||||||
|
masters and workers are then gracefully shutdown without breaking any
|
||||||
|
existing connections.
|
||||||
|
.PP
|
||||||
|
For further information, see: <http://nginx.org/en/docs/control.html>
|
||||||
|
.SH "BUGS"
|
||||||
|
.IX Header "BUGS"
|
||||||
|
If you find any bugs, please send an email to the author.
|
||||||
|
.SH "AUTHOR"
|
||||||
|
.IX Header "AUTHOR"
|
||||||
|
Jamie Nguyen <jamielinux@fedoraproject.org>
|
Binary file not shown.
83
nginx.conf
Normal file
83
nginx.conf
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
# For more information on configuration, see:
|
||||||
|
# * Official English Documentation: http://nginx.org/en/docs/
|
||||||
|
# * Official Russian Documentation: http://nginx.org/ru/docs/
|
||||||
|
|
||||||
|
user nginx;
|
||||||
|
worker_processes auto;
|
||||||
|
error_log /var/log/nginx/error.log notice;
|
||||||
|
pid /run/nginx.pid;
|
||||||
|
|
||||||
|
# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
|
||||||
|
include /usr/share/nginx/modules/*.conf;
|
||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
http {
|
||||||
|
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 /var/log/nginx/access.log main;
|
||||||
|
|
||||||
|
sendfile on;
|
||||||
|
tcp_nopush on;
|
||||||
|
keepalive_timeout 65;
|
||||||
|
types_hash_max_size 4096;
|
||||||
|
|
||||||
|
include /etc/nginx/mime.types;
|
||||||
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
# Load modular configuration files from the /etc/nginx/conf.d directory.
|
||||||
|
# See http://nginx.org/en/docs/ngx_core_module.html#include
|
||||||
|
# for more information.
|
||||||
|
include /etc/nginx/conf.d/*.conf;
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name _;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
|
||||||
|
# Load configuration files for the default server block.
|
||||||
|
include /etc/nginx/default.d/*.conf;
|
||||||
|
|
||||||
|
error_page 404 /404.html;
|
||||||
|
location = /404.html {
|
||||||
|
}
|
||||||
|
|
||||||
|
error_page 500 502 503 504 /50x.html;
|
||||||
|
location = /50x.html {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Settings for a TLS enabled server.
|
||||||
|
#
|
||||||
|
# server {
|
||||||
|
# listen 443 ssl http2;
|
||||||
|
# listen [::]:443 ssl http2;
|
||||||
|
# server_name _;
|
||||||
|
# root /usr/share/nginx/html;
|
||||||
|
#
|
||||||
|
# ssl_certificate "/etc/pki/nginx/server.crt";
|
||||||
|
# ssl_certificate_key "/etc/pki/nginx/private/server.key";
|
||||||
|
# ssl_session_cache shared:SSL:1m;
|
||||||
|
# ssl_session_timeout 10m;
|
||||||
|
# ssl_ciphers PROFILE=SYSTEM;
|
||||||
|
# ssl_prefer_server_ciphers on;
|
||||||
|
#
|
||||||
|
# # Load configuration files for the default server block.
|
||||||
|
# include /etc/nginx/default.d/*.conf;
|
||||||
|
#
|
||||||
|
# error_page 404 /404.html;
|
||||||
|
# location = /404.html {
|
||||||
|
# }
|
||||||
|
#
|
||||||
|
# error_page 500 502 503 504 /50x.html;
|
||||||
|
# location = /50x.html {
|
||||||
|
# }
|
||||||
|
# }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
109
nginx.init
109
nginx.init
@ -1,109 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# nginx - this script starts and stops the nginx daemin
|
|
||||||
#
|
|
||||||
# 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 -QUIT
|
|
||||||
retval=$?
|
|
||||||
echo
|
|
||||||
[ $retval -eq 0 ] && rm -f $lockfile
|
|
||||||
return $retval
|
|
||||||
}
|
|
||||||
|
|
||||||
restart() {
|
|
||||||
configtest || return $?
|
|
||||||
stop
|
|
||||||
start
|
|
||||||
}
|
|
||||||
|
|
||||||
reload() {
|
|
||||||
configtest || return $?
|
|
||||||
echo -n $"Reloading $prog: "
|
|
||||||
killproc $nginx -HUP
|
|
||||||
RETVAL=$?
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
|
|
||||||
force_reload() {
|
|
||||||
restart
|
|
||||||
}
|
|
||||||
|
|
||||||
configtest() {
|
|
||||||
$nginx -t -c $NGINX_CONF_FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status() {
|
|
||||||
status $prog
|
|
||||||
}
|
|
||||||
|
|
||||||
rh_status_q() {
|
|
||||||
rh_status >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
start)
|
|
||||||
rh_status_q && exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
restart|configtest)
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
reload)
|
|
||||||
rh_status_q || exit 7
|
|
||||||
$1
|
|
||||||
;;
|
|
||||||
force-reload)
|
|
||||||
force_reload
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
rh_status
|
|
||||||
;;
|
|
||||||
condrestart|try-restart)
|
|
||||||
rh_status_q || exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|configtest}"
|
|
||||||
exit 2
|
|
||||||
esac
|
|
@ -1,12 +1,14 @@
|
|||||||
/var/log/nginx/*log {
|
/var/log/nginx/*.log {
|
||||||
|
create 0640 nginx root
|
||||||
daily
|
daily
|
||||||
rotate 10
|
rotate 10
|
||||||
missingok
|
missingok
|
||||||
notifempty
|
notifempty
|
||||||
compress
|
compress
|
||||||
|
delaycompress
|
||||||
sharedscripts
|
sharedscripts
|
||||||
postrotate
|
postrotate
|
||||||
[ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
|
/bin/kill -USR1 `cat /run/nginx.pid 2>/dev/null` 2>/dev/null || true
|
||||||
endscript
|
endscript
|
||||||
}
|
}
|
||||||
|
|
||||||
|
22
nginx.service
Normal file
22
nginx.service
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=The nginx HTTP and reverse proxy server
|
||||||
|
After=network-online.target remote-fs.target nss-lookup.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=forking
|
||||||
|
PIDFile=/run/nginx.pid
|
||||||
|
# Nginx will fail to start if /run/nginx.pid already exists but has the wrong
|
||||||
|
# SELinux context. This might happen when running `nginx -t` from the cmdline.
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1268621
|
||||||
|
ExecStartPre=/usr/bin/rm -f /run/nginx.pid
|
||||||
|
ExecStartPre=/usr/sbin/nginx -t
|
||||||
|
ExecStart=/usr/sbin/nginx
|
||||||
|
ExecReload=/usr/sbin/nginx -s reload
|
||||||
|
KillSignal=SIGQUIT
|
||||||
|
TimeoutStopSec=5
|
||||||
|
KillMode=mixed
|
||||||
|
PrivateTmp=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
819
nginx.spec
819
nginx.spec
@ -1,298 +1,599 @@
|
|||||||
%define nginx_user nginx
|
%global _hardened_build 1
|
||||||
%define nginx_group %{nginx_user}
|
%global nginx_user nginx
|
||||||
%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
|
|
||||||
|
|
||||||
Name: nginx
|
# Disable strict symbol checks in the link editor.
|
||||||
Version: 0.6.36
|
# See: https://src.fedoraproject.org/rpms/redhat-rpm-config/c/078af19
|
||||||
Release: 1%{?dist}
|
%undefine _strict_symbol_defs_build
|
||||||
Summary: Robust, small and high performance http and reverse proxy server
|
|
||||||
Group: System Environment/Daemons
|
|
||||||
|
|
||||||
|
%bcond_with geoip
|
||||||
|
|
||||||
|
# nginx gperftools support should be disabled for RHEL >= 8
|
||||||
|
# see: https://bugzilla.redhat.com/show_bug.cgi?id=1931402
|
||||||
|
%if 0%{?rhel} >= 8
|
||||||
|
%global with_gperftools 0
|
||||||
|
%else
|
||||||
|
# gperftools exists only on selected arches
|
||||||
|
# gperftools *detection* is failing on ppc64*, possibly only configure
|
||||||
|
# bug, but disable anyway.
|
||||||
|
%ifnarch s390 s390x ppc64 ppc64le
|
||||||
|
%global with_gperftools 1
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%global with_aio 1
|
||||||
|
|
||||||
|
%if 0%{?fedora} > 22
|
||||||
|
%global with_mailcap_mimetypes 1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# kTLS requires OpenSSL 3.0 (default in F36+ and EL9+, available in EPEL8)
|
||||||
|
%if 0%{?fedora} >= 36 || 0%{?rhel} >= 8
|
||||||
|
%global with_ktls 1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Build against OpenSSL 1.1 on EL7
|
||||||
|
%if 0%{?rhel} == 7
|
||||||
|
%global openssl_pkgversion 11
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Build against OpenSSL 3 on EL8
|
||||||
|
%if 0%{?rhel} == 8
|
||||||
|
%global openssl_pkgversion 3
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Cf. https://www.nginx.com/blog/creating-installable-packages-dynamic-modules/
|
||||||
|
%global nginx_abiversion %{version}
|
||||||
|
|
||||||
|
%global nginx_moduledir %{_libdir}/nginx/modules
|
||||||
|
%global nginx_moduleconfdir %{_datadir}/nginx/modules
|
||||||
|
%global nginx_srcdir %{_usrsrc}/%{name}-%{version}-%{release}
|
||||||
|
|
||||||
|
# Do not generate provides/requires from nginx sources
|
||||||
|
%global __provides_exclude_from ^%{nginx_srcdir}/.*$
|
||||||
|
%global __requires_exclude_from ^%{nginx_srcdir}/.*$
|
||||||
|
|
||||||
|
|
||||||
|
Name: nginx
|
||||||
|
Epoch: 1
|
||||||
|
Version: 1.24.0
|
||||||
|
Release: %autorelease
|
||||||
|
|
||||||
|
Summary: A high performance web server and reverse proxy server
|
||||||
# BSD License (two clause)
|
# BSD License (two clause)
|
||||||
# http://www.freebsd.org/copyright/freebsd-license.html
|
# http://www.freebsd.org/copyright/freebsd-license.html
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://nginx.net/
|
URL: https://nginx.org
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
|
|
||||||
BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl-devel,perl(ExtUtils::Embed)
|
Source0: https://nginx.org/download/nginx-%{version}.tar.gz
|
||||||
Requires: pcre,zlib,openssl
|
Source1: https://nginx.org/download/nginx-%{version}.tar.gz.asc
|
||||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
# Keys are found here: https://nginx.org/en/pgp_keys.html
|
||||||
# for /usr/sbin/useradd
|
Source2: https://nginx.org/keys/maxim.key
|
||||||
Requires(pre): shadow-utils
|
Source3: https://nginx.org/keys/mdounin.key
|
||||||
Requires(post): chkconfig
|
Source4: https://nginx.org/keys/sb.key
|
||||||
# for /sbin/service
|
Source5: https://nginx.org/keys/thresh.key
|
||||||
Requires(preun): chkconfig, initscripts
|
Source10: nginx.service
|
||||||
Requires(postun): initscripts
|
Source11: nginx.logrotate
|
||||||
|
Source12: nginx.conf
|
||||||
Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.gz
|
Source13: nginx-upgrade
|
||||||
Source1: %{name}.init
|
Source14: nginx-upgrade.8
|
||||||
Source2: %{name}.logrotate
|
Source15: macros.nginxmods.in
|
||||||
Source3: virtual.conf
|
Source16: nginxmods.attr
|
||||||
Source4: ssl.conf
|
Source102: nginx-logo.png
|
||||||
Source5: nginx-upstream-fair.tgz
|
Source103: 404.html
|
||||||
Source6: upstream-fair.conf
|
Source104: 50x.html
|
||||||
Source7: %{name}.sysconfig
|
Source200: README.dynamic
|
||||||
Source100: index.html
|
Source210: UPGRADE-NOTES-1.6-to-1.10
|
||||||
Source101: poweredby.png
|
|
||||||
Source102: nginx-logo.png
|
|
||||||
Source103: 50x.html
|
|
||||||
Source104: 404.html
|
|
||||||
|
|
||||||
# removes -Werror in upstream build scripts. -Werror conflicts with
|
# removes -Werror in upstream build scripts. -Werror conflicts with
|
||||||
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
|
||||||
Patch0: nginx-auto-cc-gcc.patch
|
Patch0: 0001-remove-Werror-in-upstream-build-scripts.patch
|
||||||
|
|
||||||
# configuration patch to match all the Fedora paths for logs, pid files
|
# downstream patch - fix PIDFile race condition (rhbz#1869026)
|
||||||
# etc.
|
# rejected upstream: https://trac.nginx.org/nginx/ticket/1897
|
||||||
Patch1: nginx-conf.patch
|
Patch1: 0002-fix-PIDFile-handling.patch
|
||||||
|
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gnupg2
|
||||||
|
%if 0%{?with_gperftools}
|
||||||
|
BuildRequires: gperftools-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: openssl%{?openssl_pkgversion}-devel
|
||||||
|
BuildRequires: pcre2-devel
|
||||||
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
|
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
|
||||||
|
%if 0%{?el7}
|
||||||
|
# centos-logos el7 does not provide 'system-indexhtml'
|
||||||
|
Requires: system-logos redhat-indexhtml
|
||||||
|
# need to remove epel7 geoip sub-package, doesn't work anymore
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1576034
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1664957
|
||||||
|
Obsoletes: nginx-mod-http-geoip <= 1:1.16
|
||||||
|
%else
|
||||||
|
Requires: system-logos-httpd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Provides: webserver
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||||
|
Recommends: logrotate
|
||||||
|
%endif
|
||||||
|
Requires: %{name}-core = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
|
BuildRequires: systemd
|
||||||
|
Requires(post): systemd
|
||||||
|
Requires(preun): systemd
|
||||||
|
Requires(postun): systemd
|
||||||
|
# For external nginx modules
|
||||||
|
Provides: nginx(abi) = %{nginx_abiversion}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
|
Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
|
||||||
proxy server written by Igor Sysoev.
|
IMAP protocols, with a strong focus on high concurrency, performance and low
|
||||||
|
memory usage.
|
||||||
|
|
||||||
One third party module, nginx-upstream-fair, is added
|
%package core
|
||||||
|
Summary: nginx minimal core
|
||||||
|
%if 0%{?with_mailcap_mimetypes}
|
||||||
|
Requires: nginx-mimetypes
|
||||||
|
%endif
|
||||||
|
Requires: openssl%{?openssl_pkgversion}-libs
|
||||||
|
Requires(pre): nginx-filesystem
|
||||||
|
Conflicts: nginx < 1:1.20.2-4
|
||||||
|
|
||||||
|
%description core
|
||||||
|
nginx minimal core
|
||||||
|
|
||||||
|
%package all-modules
|
||||||
|
Summary: A meta package that installs all available Nginx modules
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
|
Requires: nginx-mod-http-geoip = %{epoch}:%{version}-%{release}
|
||||||
|
%endif
|
||||||
|
Requires: nginx-mod-http-image-filter = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: nginx-mod-http-perl = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: nginx-mod-http-xslt-filter = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: nginx-mod-mail = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: nginx-mod-stream = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
|
%description all-modules
|
||||||
|
Meta package that installs all available nginx modules.
|
||||||
|
|
||||||
|
%package filesystem
|
||||||
|
Summary: The basic directory layout for the Nginx server
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires(pre): shadow-utils
|
||||||
|
|
||||||
|
%description filesystem
|
||||||
|
The nginx-filesystem package contains the basic directory layout
|
||||||
|
for the Nginx server including the correct permissions for the
|
||||||
|
directories.
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
|
%package mod-http-geoip
|
||||||
|
Summary: Nginx HTTP geoip module
|
||||||
|
BuildRequires: GeoIP-devel
|
||||||
|
Requires: nginx(abi) = %{nginx_abiversion}
|
||||||
|
Requires: GeoIP
|
||||||
|
|
||||||
|
%description mod-http-geoip
|
||||||
|
%{summary}.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%package mod-http-image-filter
|
||||||
|
Summary: Nginx HTTP image filter module
|
||||||
|
BuildRequires: gd-devel
|
||||||
|
Requires: nginx(abi) = %{nginx_abiversion}
|
||||||
|
Requires: gd
|
||||||
|
|
||||||
|
%description mod-http-image-filter
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%package mod-http-perl
|
||||||
|
Summary: Nginx HTTP perl module
|
||||||
|
BuildRequires: perl-devel
|
||||||
|
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 7
|
||||||
|
BuildRequires: perl-generators
|
||||||
|
%endif
|
||||||
|
BuildRequires: perl(ExtUtils::Embed)
|
||||||
|
Requires: nginx(abi) = %{nginx_abiversion}
|
||||||
|
Requires: perl(constant)
|
||||||
|
|
||||||
|
%description mod-http-perl
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%package mod-http-xslt-filter
|
||||||
|
Summary: Nginx XSLT module
|
||||||
|
BuildRequires: libxslt-devel
|
||||||
|
Requires: nginx(abi) = %{nginx_abiversion}
|
||||||
|
|
||||||
|
%description mod-http-xslt-filter
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%package mod-mail
|
||||||
|
Summary: Nginx mail modules
|
||||||
|
Requires: nginx(abi) = %{nginx_abiversion}
|
||||||
|
|
||||||
|
%description mod-mail
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%package mod-stream
|
||||||
|
Summary: Nginx stream modules
|
||||||
|
Requires: nginx(abi) = %{nginx_abiversion}
|
||||||
|
|
||||||
|
%description mod-stream
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%package mod-devel
|
||||||
|
Summary: Nginx module development files
|
||||||
|
Requires: nginx = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: make
|
||||||
|
Requires: gcc
|
||||||
|
Requires: gd-devel
|
||||||
|
%if 0%{?with_gperftools}
|
||||||
|
Requires: gperftools-devel
|
||||||
|
%endif
|
||||||
|
%if %{with geoip}
|
||||||
|
Requires: GeoIP-devel
|
||||||
|
%endif
|
||||||
|
Requires: libxslt-devel
|
||||||
|
Requires: openssl%{?openssl_pkgversion}-devel
|
||||||
|
Requires: pcre2-devel
|
||||||
|
Requires: perl-devel
|
||||||
|
Requires: perl(ExtUtils::Embed)
|
||||||
|
Requires: zlib-devel
|
||||||
|
|
||||||
|
%description mod-devel
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
# Combine all keys from upstream into one file
|
||||||
|
cat %{S:2} %{S:3} %{S:4} %{S:5} > %{_builddir}/%{name}.gpg
|
||||||
|
%{gpgverify} --keyring='%{_builddir}/%{name}.gpg' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||||
|
%autosetup -p1
|
||||||
|
cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} .
|
||||||
|
|
||||||
|
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
|
||||||
|
sed -i -e 's#KillMode=.*#KillMode=process#g' nginx.service
|
||||||
|
sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' nginx.conf
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?openssl_pkgversion}
|
||||||
|
sed \
|
||||||
|
-e 's|\(ngx_feature_path=\)$|\1%{_includedir}/openssl%{openssl_pkgversion}|' \
|
||||||
|
-e 's|\(ngx_feature_libs="\)|\1-L%{_libdir}/openssl%{openssl_pkgversion} |' \
|
||||||
|
-i auto/lib/openssl/conf
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Prepare sources for installation
|
||||||
|
cp -a ../%{name}-%{version} ../%{name}-%{version}-%{release}-src
|
||||||
|
mv ../%{name}-%{version}-%{release}-src .
|
||||||
|
|
||||||
%patch0 -p0
|
|
||||||
%patch1 -p0
|
|
||||||
%{__tar} zxvf %{SOURCE5}
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# nginx does not utilize a standard configure script. It has its own
|
# nginx does not utilize a standard configure script. It has its own
|
||||||
# and the standard configure options cause the nginx configure script
|
# and the standard configure options cause the nginx configure script
|
||||||
# to error out. This is is also the reason for the DESTDIR environment
|
# to error out. This is is also the reason for the DESTDIR environment
|
||||||
# variable. The configure script(s) have been patched (Patch1 and
|
# variable.
|
||||||
# Patch2) in order to support installing into a build environment.
|
|
||||||
export DESTDIR=%{buildroot}
|
export DESTDIR=%{buildroot}
|
||||||
./configure \
|
# So the perl module finds its symbols:
|
||||||
|
nginx_ldopts="$RPM_LD_FLAGS -Wl,-E"
|
||||||
|
if ! ./configure \
|
||||||
|
--prefix=%{_datadir}/nginx \
|
||||||
|
--sbin-path=%{_sbindir}/nginx \
|
||||||
|
--modules-path=%{nginx_moduledir} \
|
||||||
|
--conf-path=%{_sysconfdir}/nginx/nginx.conf \
|
||||||
|
--error-log-path=%{_localstatedir}/log/nginx/error.log \
|
||||||
|
--http-log-path=%{_localstatedir}/log/nginx/access.log \
|
||||||
|
--http-client-body-temp-path=%{_localstatedir}/lib/nginx/tmp/client_body \
|
||||||
|
--http-proxy-temp-path=%{_localstatedir}/lib/nginx/tmp/proxy \
|
||||||
|
--http-fastcgi-temp-path=%{_localstatedir}/lib/nginx/tmp/fastcgi \
|
||||||
|
--http-uwsgi-temp-path=%{_localstatedir}/lib/nginx/tmp/uwsgi \
|
||||||
|
--http-scgi-temp-path=%{_localstatedir}/lib/nginx/tmp/scgi \
|
||||||
|
--pid-path=/run/nginx.pid \
|
||||||
|
--lock-path=/run/lock/subsys/nginx \
|
||||||
--user=%{nginx_user} \
|
--user=%{nginx_user} \
|
||||||
--group=%{nginx_group} \
|
--group=%{nginx_user} \
|
||||||
--prefix=%{nginx_datadir} \
|
--with-compat \
|
||||||
--sbin-path=%{_sbindir}/%{name} \
|
--with-debug \
|
||||||
--conf-path=%{nginx_confdir}/%{name}.conf \
|
%if 0%{?with_aio}
|
||||||
--error-log-path=%{nginx_logdir}/error.log \
|
--with-file-aio \
|
||||||
--http-log-path=%{nginx_logdir}/access.log \
|
%endif
|
||||||
--http-client-body-temp-path=%{nginx_home_tmp}/client_body \
|
%if 0%{?with_gperftools}
|
||||||
--http-proxy-temp-path=%{nginx_home_tmp}/proxy \
|
--with-google_perftools_module \
|
||||||
--http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
|
%endif
|
||||||
--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_addition_module \
|
||||||
--with-http_sub_module \
|
--with-http_auth_request_module \
|
||||||
--with-http_dav_module \
|
--with-http_dav_module \
|
||||||
|
--with-http_degradation_module \
|
||||||
--with-http_flv_module \
|
--with-http_flv_module \
|
||||||
|
%if %{with geoip}
|
||||||
|
--with-http_geoip_module=dynamic \
|
||||||
|
--with-stream_geoip_module=dynamic \
|
||||||
|
%endif
|
||||||
|
--with-http_gunzip_module \
|
||||||
--with-http_gzip_static_module \
|
--with-http_gzip_static_module \
|
||||||
|
--with-http_image_filter_module=dynamic \
|
||||||
|
--with-http_mp4_module \
|
||||||
|
--with-http_perl_module=dynamic \
|
||||||
|
--with-http_random_index_module \
|
||||||
|
--with-http_realip_module \
|
||||||
|
--with-http_secure_link_module \
|
||||||
|
--with-http_slice_module \
|
||||||
|
--with-http_ssl_module \
|
||||||
--with-http_stub_status_module \
|
--with-http_stub_status_module \
|
||||||
--with-http_perl_module \
|
--with-http_sub_module \
|
||||||
--with-mail \
|
--with-http_v2_module \
|
||||||
|
--with-http_xslt_module=dynamic \
|
||||||
|
--with-mail=dynamic \
|
||||||
--with-mail_ssl_module \
|
--with-mail_ssl_module \
|
||||||
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
|
%if 0%{?with_ktls}
|
||||||
--add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair
|
--with-openssl-opt=enable-ktls \
|
||||||
make %{?_smp_mflags}
|
%endif
|
||||||
|
--with-pcre \
|
||||||
# rename the readme for nginx-upstream-fair so it doesn't conflict with the main
|
--with-pcre-jit \
|
||||||
# readme
|
--with-stream=dynamic \
|
||||||
mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair
|
--with-stream_realip_module \
|
||||||
|
--with-stream_ssl_module \
|
||||||
%install
|
--with-stream_ssl_preread_module \
|
||||||
rm -rf %{buildroot}
|
--with-threads \
|
||||||
make install DESTDIR=%{buildroot} INSTALLDIRS=vendor
|
--with-cc-opt="%{optflags} $(pcre2-config --cflags)" \
|
||||||
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
|
--with-ld-opt="$nginx_ldopts"; then
|
||||||
find %{buildroot} -type f -name perllocal.pod -exec rm -f {} \;
|
: configure failed
|
||||||
find %{buildroot} -type f -empty -exec rm -f {} \;
|
cat objs/autoconf.err
|
||||||
find %{buildroot} -type f -exec chmod 0644 {} \;
|
exit 1
|
||||||
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
|
fi
|
||||||
|
|
||||||
|
%make_build
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install 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 -iname '*.so' -exec chmod 0755 '{}' \;
|
||||||
|
|
||||||
|
install -p -D -m 0644 ./nginx.service \
|
||||||
|
%{buildroot}%{_unitdir}/nginx.service
|
||||||
|
install -p -D -m 0644 %{SOURCE11} \
|
||||||
|
%{buildroot}%{_sysconfdir}/logrotate.d/nginx
|
||||||
|
|
||||||
|
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/systemd/system/nginx.service.d
|
||||||
|
install -p -d -m 0755 %{buildroot}%{_unitdir}/nginx.service.d
|
||||||
|
|
||||||
|
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/conf.d
|
||||||
|
install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nginx/default.d
|
||||||
|
|
||||||
|
install -p -d -m 0700 %{buildroot}%{_localstatedir}/lib/nginx
|
||||||
|
install -p -d -m 0700 %{buildroot}%{_localstatedir}/lib/nginx/tmp
|
||||||
|
install -p -d -m 0700 %{buildroot}%{_localstatedir}/log/nginx
|
||||||
|
|
||||||
|
install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/html
|
||||||
|
install -p -d -m 0755 %{buildroot}%{nginx_moduleconfdir}
|
||||||
|
install -p -d -m 0755 %{buildroot}%{nginx_moduledir}
|
||||||
|
|
||||||
|
install -p -m 0644 ./nginx.conf \
|
||||||
|
%{buildroot}%{_sysconfdir}/nginx
|
||||||
|
|
||||||
|
rm -f %{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
|
%if 0%{?el7}
|
||||||
|
ln -s ../../doc/HTML/index.html \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
|
ln -s ../../doc/HTML/img \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/img
|
||||||
|
ln -s ../../doc/HTML/en-US \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/en-US
|
||||||
|
%else
|
||||||
|
ln -s ../../testpage/index.html \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
|
%endif
|
||||||
|
install -p -m 0644 %{SOURCE102} \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html
|
||||||
|
ln -s nginx-logo.png %{buildroot}%{_datadir}/nginx/html/poweredby.png
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/nginx/html/icons
|
||||||
|
|
||||||
|
# Symlink for the powered-by-$DISTRO image:
|
||||||
|
ln -s ../../../pixmaps/poweredby.png \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/icons/poweredby.png
|
||||||
|
|
||||||
|
%if 0%{?rhel} >= 9
|
||||||
|
ln -s ../../pixmaps/system-noindex-logo.png \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/system_noindex_logo.png
|
||||||
|
%endif
|
||||||
|
|
||||||
|
install -p -m 0644 %{SOURCE103} %{SOURCE104} \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html
|
||||||
|
|
||||||
|
%if 0%{?with_mailcap_mimetypes}
|
||||||
|
rm -f %{buildroot}%{_sysconfdir}/nginx/mime.types
|
||||||
|
%endif
|
||||||
|
|
||||||
|
install -p -D -m 0644 %{_builddir}/nginx-%{version}/objs/nginx.8 \
|
||||||
|
%{buildroot}%{_mandir}/man8/nginx.8
|
||||||
|
|
||||||
|
install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade
|
||||||
|
install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
|
||||||
|
|
||||||
|
for i in ftdetect ftplugin indent syntax; do
|
||||||
|
install -p -D -m644 contrib/vim/${i}/nginx.vim \
|
||||||
|
%{buildroot}%{_datadir}/vim/vimfiles/${i}/nginx.vim
|
||||||
|
done
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
|
echo 'load_module "%{nginx_moduledir}/ngx_http_geoip_module.so";' \
|
||||||
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-geoip.conf
|
||||||
|
%endif
|
||||||
|
echo 'load_module "%{nginx_moduledir}/ngx_http_image_filter_module.so";' \
|
||||||
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-image-filter.conf
|
||||||
|
echo 'load_module "%{nginx_moduledir}/ngx_http_perl_module.so";' \
|
||||||
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-perl.conf
|
||||||
|
echo 'load_module "%{nginx_moduledir}/ngx_http_xslt_filter_module.so";' \
|
||||||
|
> %{buildroot}%{nginx_moduleconfdir}/mod-http-xslt-filter.conf
|
||||||
|
echo 'load_module "%{nginx_moduledir}/ngx_mail_module.so";' \
|
||||||
|
> %{buildroot}%{nginx_moduleconfdir}/mod-mail.conf
|
||||||
|
echo 'load_module "%{nginx_moduledir}/ngx_stream_module.so";' \
|
||||||
|
> %{buildroot}%{nginx_moduleconfdir}/mod-stream.conf
|
||||||
|
|
||||||
|
# Install files for supporting nginx module builds
|
||||||
|
## Install source files
|
||||||
|
mkdir -p %{buildroot}%{_usrsrc}
|
||||||
|
mv %{name}-%{version}-%{release}-src %{buildroot}%{nginx_srcdir}
|
||||||
|
## Install rpm macros
|
||||||
|
mkdir -p %{buildroot}%{_rpmmacrodir}
|
||||||
|
sed -e "s|@@NGINX_ABIVERSION@@|%{nginx_abiversion}|g" \
|
||||||
|
-e "s|@@NGINX_MODDIR@@|%{nginx_moduledir}|g" \
|
||||||
|
-e "s|@@NGINX_MODCONFDIR@@|%{nginx_moduleconfdir}|g" \
|
||||||
|
-e "s|@@NGINX_SRCDIR@@|%{nginx_srcdir}|g" \
|
||||||
|
%{SOURCE15} > %{buildroot}%{_rpmmacrodir}/macros.nginxmods
|
||||||
|
## Install dependency generator
|
||||||
|
install -Dpm0644 %{SOURCE16} %{buildroot}%{_fileattrsdir}/nginxmods.attr
|
||||||
|
|
||||||
|
|
||||||
|
%pre filesystem
|
||||||
|
getent group %{nginx_user} > /dev/null || groupadd -r %{nginx_user}
|
||||||
|
getent passwd %{nginx_user} > /dev/null || \
|
||||||
|
useradd -r -d %{_localstatedir}/lib/nginx -g %{nginx_user} \
|
||||||
|
-s /sbin/nologin -c "Nginx web server" %{nginx_user}
|
||||||
|
exit 0
|
||||||
|
|
||||||
|
%post
|
||||||
|
%systemd_post nginx.service
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
|
%post mod-http-geoip
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
|
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%post mod-http-image-filter
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
|
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post mod-http-perl
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
|
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post mod-http-xslt-filter
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
|
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post mod-mail
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
|
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post mod-stream
|
||||||
|
if [ $1 -eq 1 ]; then
|
||||||
|
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
%preun
|
||||||
|
%systemd_preun nginx.service
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
|
%systemd_postun nginx.service
|
||||||
if [ $1 -ge 1 ]; then
|
if [ $1 -ge 1 ]; then
|
||||||
/sbin/service %{name} condrestart > /dev/null 2>&1 || :
|
/usr/bin/nginx-upgrade >/dev/null 2>&1 || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%if 0%{?rhel} == 7
|
||||||
%doc LICENSE CHANGES README nginx-upstream-fair/README.nginx-upstream-fair
|
%doc UPGRADE-NOTES-1.6-to-1.10
|
||||||
%{nginx_datadir}/
|
%endif
|
||||||
%{_sbindir}/%{name}
|
%{_datadir}/nginx/html/*
|
||||||
%{_mandir}/man3/%{name}.3pm.gz
|
%{_bindir}/nginx-upgrade
|
||||||
%{_initrddir}/%{name}
|
%{_datadir}/vim/vimfiles/ftdetect/nginx.vim
|
||||||
%dir %{nginx_confdir}
|
%{_datadir}/vim/vimfiles/ftplugin/nginx.vim
|
||||||
%dir %{nginx_confdir}/conf.d
|
%{_datadir}/vim/vimfiles/syntax/nginx.vim
|
||||||
%config(noreplace) %{nginx_confdir}/conf.d/*.conf
|
%{_datadir}/vim/vimfiles/indent/nginx.vim
|
||||||
%config(noreplace) %{nginx_confdir}/win-utf
|
%{_mandir}/man3/nginx.3pm*
|
||||||
%config(noreplace) %{nginx_confdir}/%{name}.conf.default
|
%{_mandir}/man8/nginx.8*
|
||||||
%config(noreplace) %{nginx_confdir}/mime.types.default
|
%{_mandir}/man8/nginx-upgrade.8*
|
||||||
%config(noreplace) %{nginx_confdir}/fastcgi_params
|
%{_unitdir}/nginx.service
|
||||||
%config(noreplace) %{nginx_confdir}/fastcgi_params.default
|
|
||||||
%config(noreplace) %{nginx_confdir}/koi-win
|
%files core
|
||||||
%config(noreplace) %{nginx_confdir}/koi-utf
|
%license LICENSE
|
||||||
%config(noreplace) %{nginx_confdir}/%{name}.conf
|
%doc CHANGES README README.dynamic
|
||||||
%config(noreplace) %{nginx_confdir}/mime.types
|
%{_sbindir}/nginx
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
%config(noreplace) %{_sysconfdir}/nginx/fastcgi.conf
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
%config(noreplace) %{_sysconfdir}/nginx/fastcgi.conf.default
|
||||||
%dir %{perl_vendorarch}/auto/%{name}
|
%config(noreplace) %{_sysconfdir}/nginx/fastcgi_params
|
||||||
%{perl_vendorarch}/%{name}.pm
|
%config(noreplace) %{_sysconfdir}/nginx/fastcgi_params.default
|
||||||
%{perl_vendorarch}/auto/%{name}/%{name}.so
|
%config(noreplace) %{_sysconfdir}/nginx/koi-utf
|
||||||
%attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home}
|
%config(noreplace) %{_sysconfdir}/nginx/koi-win
|
||||||
%attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp}
|
%if ! 0%{?with_mailcap_mimetypes}
|
||||||
%attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir}
|
%config(noreplace) %{_sysconfdir}/nginx/mime.types
|
||||||
|
%endif
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/mime.types.default
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/nginx.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/nginx.conf.default
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/scgi_params
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/scgi_params.default
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/uwsgi_params
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/uwsgi_params.default
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/win-utf
|
||||||
|
%config(noreplace) %{_sysconfdir}/logrotate.d/nginx
|
||||||
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx
|
||||||
|
%attr(770,%{nginx_user},root) %dir %{_localstatedir}/lib/nginx/tmp
|
||||||
|
%attr(711,root,root) %dir %{_localstatedir}/log/nginx
|
||||||
|
%ghost %attr(640,%{nginx_user},root) %{_localstatedir}/log/nginx/access.log
|
||||||
|
%ghost %attr(640,%{nginx_user},root) %{_localstatedir}/log/nginx/error.log
|
||||||
|
%dir %{nginx_moduledir}
|
||||||
|
%dir %{nginx_moduleconfdir}
|
||||||
|
|
||||||
|
%files all-modules
|
||||||
|
|
||||||
|
%files filesystem
|
||||||
|
%dir %{_datadir}/nginx
|
||||||
|
%dir %{_datadir}/nginx/html
|
||||||
|
%dir %{_sysconfdir}/nginx
|
||||||
|
%dir %{_sysconfdir}/nginx/conf.d
|
||||||
|
%dir %{_sysconfdir}/nginx/default.d
|
||||||
|
%dir %{_sysconfdir}/systemd/system/nginx.service.d
|
||||||
|
%dir %{_unitdir}/nginx.service.d
|
||||||
|
|
||||||
|
%if %{with geoip}
|
||||||
|
%files mod-http-geoip
|
||||||
|
%{nginx_moduleconfdir}/mod-http-geoip.conf
|
||||||
|
%{nginx_moduledir}/ngx_http_geoip_module.so
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files mod-http-image-filter
|
||||||
|
%{nginx_moduleconfdir}/mod-http-image-filter.conf
|
||||||
|
%{nginx_moduledir}/ngx_http_image_filter_module.so
|
||||||
|
|
||||||
|
%files mod-http-perl
|
||||||
|
%{nginx_moduleconfdir}/mod-http-perl.conf
|
||||||
|
%{nginx_moduledir}/ngx_http_perl_module.so
|
||||||
|
%dir %{perl_vendorarch}/auto/nginx
|
||||||
|
%{perl_vendorarch}/nginx.pm
|
||||||
|
%{perl_vendorarch}/auto/nginx/nginx.so
|
||||||
|
|
||||||
|
%files mod-http-xslt-filter
|
||||||
|
%{nginx_moduleconfdir}/mod-http-xslt-filter.conf
|
||||||
|
%{nginx_moduledir}/ngx_http_xslt_filter_module.so
|
||||||
|
|
||||||
|
%files mod-mail
|
||||||
|
%{nginx_moduleconfdir}/mod-mail.conf
|
||||||
|
%{nginx_moduledir}/ngx_mail_module.so
|
||||||
|
|
||||||
|
%files mod-stream
|
||||||
|
%{nginx_moduleconfdir}/mod-stream.conf
|
||||||
|
%{nginx_moduledir}/ngx_stream_module.so
|
||||||
|
|
||||||
|
%files mod-devel
|
||||||
|
%{_rpmmacrodir}/macros.nginxmods
|
||||||
|
%{_fileattrsdir}/nginxmods.attr
|
||||||
|
%{nginx_srcdir}/
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> 0.6.36-1
|
%autochangelog
|
||||||
- update to 0.6.36
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.35-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
|
|
||||||
- rebuild
|
|
||||||
|
|
||||||
* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-1
|
|
||||||
- update to 0.6.35
|
|
||||||
|
|
||||||
* Sat Jan 17 2009 Tomas Mraz <tmraz@redhat.com> - 0.6.34-2
|
|
||||||
- rebuild with new openssl
|
|
||||||
|
|
||||||
* Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.34-1
|
|
||||||
- update to 0.6.34
|
|
||||||
|
|
||||||
* Thu Dec 4 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 0.6.33-2
|
|
||||||
- Fix inclusion of /usr/share/nginx tree => no unowned directories.
|
|
||||||
|
|
||||||
* Sun Nov 23 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.33-1
|
|
||||||
- update to 0.6.33
|
|
||||||
|
|
||||||
* Tue Jul 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.32-1
|
|
||||||
- update to 0.6.32
|
|
||||||
- nginx now supports DESTDIR so removed the patches that enabled it
|
|
||||||
|
|
||||||
* Mon May 26 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-3
|
|
||||||
- init script fixes
|
|
||||||
- resolve 'listen 80 default' [#447873]
|
|
||||||
|
|
||||||
* Mon May 12 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-2
|
|
||||||
- update to 0.6.31
|
|
||||||
|
|
||||||
* Sun May 11 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.30-2
|
|
||||||
- upate to new upstream stable branch 0.6
|
|
||||||
- added 3rd party module nginx-upstream-fair
|
|
||||||
- added default webpages
|
|
||||||
|
|
||||||
* Sun Apr 20 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-2
|
|
||||||
- update init script to match recommended guidelines
|
|
||||||
- add /etc/nginx/conf.d support [#443280]
|
|
||||||
- use /etc/sysconfig/nginx to determine nginx.conf [#442708]
|
|
||||||
|
|
||||||
* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.5.35-3
|
|
||||||
- add Requires for versioned perl (libperl.so)
|
|
||||||
- drop silly file Requires
|
|
||||||
|
|
||||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.5.35-2
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Sat Jan 19 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-1
|
|
||||||
- update to 0.5.35
|
|
||||||
|
|
||||||
* Sat Dec 15 2007 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.34-1
|
|
||||||
- update to 0.5.34
|
|
||||||
|
|
||||||
* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.5.33-2
|
|
||||||
- Rebuild for deps
|
|
||||||
|
|
||||||
* Sun Nov 11 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.33-1
|
|
||||||
- update to 0.5.33
|
|
||||||
|
|
||||||
* Mon Sep 24 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.32-1
|
|
||||||
- updated to 0.5.32
|
|
||||||
- fixed rpmlint UTF-8 complaints.
|
|
||||||
|
|
||||||
* Sat Aug 18 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.31-2
|
|
||||||
- added --with-http_stub_status_module build option.
|
|
||||||
- added --with-http_sub_module build option.
|
|
||||||
- added use of pcre-config --cflags
|
|
||||||
|
|
||||||
* Fri Aug 17 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.31-1
|
|
||||||
- Update to 0.5.31
|
|
||||||
- specify license is BSD
|
|
||||||
|
|
||||||
* Sat Aug 11 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.30-2
|
|
||||||
- Add BuildRequires: perl-devel - fixing rawhide build
|
|
||||||
|
|
||||||
* Mon Jul 30 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.30-1
|
|
||||||
- Update to 0.5.30
|
|
||||||
|
|
||||||
* Tue Jul 24 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.29-1
|
|
||||||
- Update to 0.5.29
|
|
||||||
|
|
||||||
* Wed Jul 18 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.28-1
|
|
||||||
- Update to 0.5.28
|
|
||||||
|
|
||||||
* Mon Jul 09 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.27-1
|
|
||||||
- Update to 0.5.27
|
|
||||||
|
|
||||||
* Mon Jun 18 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.26-1
|
|
||||||
- Update to 0.5.26
|
|
||||||
|
|
||||||
* Sat Apr 28 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.19-1
|
|
||||||
- Update to 0.5.19
|
|
||||||
|
|
||||||
* Mon Apr 02 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.17-1
|
|
||||||
- Update to 0.5.17
|
|
||||||
|
|
||||||
* Mon Mar 26 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.16-1
|
|
||||||
- Update to 0.5.16
|
|
||||||
- add ownership of /usr/share/nginx/html (#233950)
|
|
||||||
|
|
||||||
* Fri Mar 23 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.15-3
|
|
||||||
- fixed package review bugs (#235222) given by ruben@rubenkerkhof.com
|
|
||||||
|
|
||||||
* Thu Mar 22 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.15-2
|
|
||||||
- fixed package review bugs (#233522) given by kevin@tummy.com
|
|
||||||
|
|
||||||
* Thu Mar 22 2007 Jeremy Hinegardner <jeremy@hinegardner.org> - 0.5.15-1
|
|
||||||
- create patches to assist with building for Fedora
|
|
||||||
- initial packaging for Fedora
|
|
||||||
|
@ -1,4 +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
|
|
14
nginxmods.attr
Normal file
14
nginxmods.attr
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
%__nginxmods_requires() %{lua:
|
||||||
|
-- Match buildroot paths of the form
|
||||||
|
-- /PATH/OF/BUILDROOT/usr/lib/nginx/modules/ and
|
||||||
|
-- /PATH/OF/BUILDROOT/usr/lib64/nginx/modules/
|
||||||
|
-- generating a line of the form:
|
||||||
|
-- nginx(abi) = VERSION
|
||||||
|
local path = rpm.expand("%1")
|
||||||
|
if path:match("/usr/lib%d*/nginx/modules/.*") then
|
||||||
|
local requires = "nginx(abi) = " .. rpm.expand("%{_nginx_abiversion}")
|
||||||
|
print(requires)
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
%__nginxmods_path ^%{_prefix}/lib(64)?/nginx/modules/.*\\.so$
|
7
plans/all.fmf
Normal file
7
plans/all.fmf
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
summary: Test plan with all Fedora tests
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
url: https://src.fedoraproject.org/tests/nginx.git
|
||||||
|
execute:
|
||||||
|
how: tmt
|
||||||
|
|
BIN
poweredby.png
BIN
poweredby.png
Binary file not shown.
Before Width: | Height: | Size: 3.0 KiB |
41
sb.key
Normal file
41
sb.key
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
Version: GnuPG v1.4.11 (FreeBSD)
|
||||||
|
|
||||||
|
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
|
||||||
|
CoHAyoqJeb/xLBwuKWg0/4U=
|
||||||
|
=iFlP
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
3
sources
3
sources
@ -1 +1,2 @@
|
|||||||
15cce6102a2efcf4d4acde9bb71ea6d3 nginx-0.6.36.tar.gz
|
SHA512 (nginx-1.24.0.tar.gz) = 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
|
||||||
|
SHA512 (nginx-1.24.0.tar.gz.asc) = a6b6b0b8bd28338465737c54e058a95747330f68bd0b5d1113341eea6025e5092c0707c2fbc5d58eb18e6eedd321c797274f4e3174652ed13f40b9ccf7705436
|
||||||
|
24
ssl.conf
24
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;
|
|
||||||
# }
|
|
||||||
#}
|
|
||||||
|
|
147
thresh.key
Normal file
147
thresh.key
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
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
|
||||||
|
=t1B0
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
@ -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;
|
|
||||||
# }
|
|
||||||
|
|
||||||
|
|
15
virtual.conf
15
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;
|
|
||||||
# }
|
|
||||||
#}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user