Commit Graph

169 Commits

Author SHA1 Message Date
Jamie Nguyen
abfbfbdfeb Remove systemd conditionals 2015-05-10 09:59:31 +01:00
Jamie Nguyen
fc7b5b3b29 Add TimeoutStopSec=5 and KillMode=mixed 2015-05-10 09:56:51 +01:00
Jamie Nguyen
c7df15134f Improve nginx.conf 2015-05-10 09:56:23 +01:00
Jamie Nguyen
675148b262 Update to upstream release 1.6.3 2015-04-09 19:57:31 +01:00
Jamie Nguyen
56a5c49435 Merge branch 'master' into epel7 2014-10-22 20:48:10 +01:00
Jamie Nguyen
ba5e503c9a Fix package ownership of directories 2014-10-22 20:46:06 +01:00
Jamie Nguyen
bb4239efa0 Merge branch 'master' into epel7 2014-10-22 20:14:38 +01:00
Jamie Nguyen
09d71762bc Revert "Create nginx-filesystem subpackage (patch from Remi Collet)"
This reverts commit aa7abdd0d6.
2014-10-22 20:14:35 +01:00
Jamie Nguyen
790674dc4a Add vim files (#1142849) 2014-10-22 19:17:55 +01:00
Jamie Nguyen
aa7abdd0d6 Create nginx-filesystem subpackage (patch from Remi Collet) 2014-09-22 17:58:51 +01:00
Jamie Nguyen
24a9355337 Create /etc/nginx/default.d directory 2014-09-22 12:14:28 +01:00
Jamie Nguyen
84b0cb93c6 Create nginx-filesystem subpackage (patch from Remi Collet) 2014-09-22 12:07:39 +01:00
Jamie Nguyen
618531bf75 Merge branch 'master' into epel7 2014-09-17 07:38:00 +01:00
Jamie Nguyen
934d6046fa Update to upstream release 1.6.2 2014-09-17 07:37:25 +01:00
Jitka Plesnikova
8f91f185c5 Perl 5.20 rebuild 2014-08-27 10:33:39 +02:00
Peter Robinson
fc9c813ccc - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 11:49:21 +00:00
Jamie Nguyen
c6a4d3a834 Merge branch 'master' into epel7 2014-08-05 16:43:47 +01:00
Jamie Nguyen
88e7aec1b1 Bump release 2014-08-05 16:42:48 +01:00
Jamie Nguyen
ce560d3c4b Merge branch 'master' into epel7 2014-08-05 15:57:02 +01:00
Jamie Nguyen
b074711b52 Revert "systemd is fedora 16+ or EL7"
This reverts commit 23f650d0c7.
2014-08-05 15:56:54 +01:00
Jamie Nguyen
3c10ed06a9 Add logic for EPEL 7 2014-08-05 15:49:52 +01:00
Jamie Nguyen
5a305d683a Update to upstream release 1.6.1 (CVE-2014-3556) 2014-08-05 15:40:38 +01:00
Warren Togami
e754ce11f2 Merge remote-tracking branch 'origin/f21' into epel7 2014-07-30 13:05:55 -10:00
Warren Togami
23f650d0c7 systemd is fedora 16+ or EL7 2014-07-29 17:59:01 -10:00
Jamie Nguyen
9cbbeeb8bf Fix FTBFS on aarch64 (thanks Yaakov Selkowitz <yselkowi@redhat.com>) 2014-07-02 17:29:22 +01:00
Dennis Gilmore
2d20b78566 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 07:48:04 -05:00
Jamie Nguyen
f181109e9a Update to upstream release 1.6.0 2014-04-26 20:45:22 +01:00
Jamie Nguyen
95d07b04c4 Merge branch 'master' into f19 2014-03-18 21:15:38 +00:00
Jamie Nguyen
6166551fc5 Update to upstream release 1.4.7 2014-03-18 21:13:53 +00:00
Jamie Nguyen
2ef2d094a7 Merge branch 'master' into f19 2014-03-05 18:46:21 +00:00
Jamie Nguyen
7d51f58419 Update to upstream release 1.4.6 2014-03-05 18:44:59 +00:00
Jamie Nguyen
5b0b18bc81 Merge branch 'master' into f19 2014-02-16 18:14:58 +00:00
Jamie Nguyen
9fc9ff2637 Bump release 2014-02-16 18:14:06 +00:00
Jamie Nguyen
3335a2cdf2 Merge branch 'master' into f19 2014-02-16 18:13:15 +00:00
Jamie Nguyen
d7b6d7c0a6 Avoid multiple index directives (#1065488). 2014-02-16 18:11:06 +00:00
Jamie Nguyen
1f05349f9e Merge branch 'master' into f19 2014-02-16 18:02:14 +00:00
Jamie Nguyen
b55cfc23dd Update to upstream release 1.4.5 2014-02-16 18:00:10 +00:00
Peter Borsa
fd256c6cd1 Merge branch 'master' into f19 2013-11-20 10:53:00 +01:00
Peter Borsa
39dbfbd198 Fix the last three commits 2013-11-20 10:25:37 +01:00
Peter Borsa
c20a402e83 Updated sources file 2013-11-20 10:05:12 +01:00
Peter Borsa
74d92ab976 Commited sources file 2013-11-20 09:53:57 +01:00
Peter Borsa
cbdefbd6bb Source files uploaded again 2013-11-20 09:52:00 +01:00
Peter Borsa
8370461027 Update to 1.4.4 2013-11-20 09:40:18 +01:00
Jamie Nguyen
d5faf95acf Merge branch 'master' into f19
Conflicts:
	nginx.spec
	sources
2013-11-03 09:30:36 +00:00
Jamie Nguyen
7b9ca4a9d9 Update to upstream release 1.4.3 2013-11-03 09:28:14 +00:00
Jonathan Steffan
e09136d836 Add conditionals to assist in backporting nginx to non-systemd distros. 2013-08-09 11:30:28 -06:00
Jonathan Steffan
6267fca680 Add conditionals to assist in backporting nginx to non-systemd distros. 2013-08-09 11:28:28 -06:00
Petr Písař
eed161fdbd Perl 5.18 rebuild 2013-08-03 12:06:00 +02:00
Jamie Nguyen
3d430736cc Update to upstream release 1.4.2 2013-07-19 11:20:16 +01:00
Petr Písař
45ce8ed829 Perl 5.18 rebuild 2013-07-17 11:31:47 +02:00