Commit graph

329 commits

Author SHA1 Message Date
James Fryman
f54a88975a Merge pull request #707 from werekraken/unix_socket
Add unix socket for listening.
2015-11-02 13:38:26 -06:00
Phil Friderici
c849c2cb7d Add parameter to allow setting error_log severity level 2015-11-01 13:14:08 +00:00
matt.cover
57a42466cf Add unix socket for listening. 2015-10-30 12:14:47 -07:00
James Fryman
d5bdfb252c Merge pull request #703 from jhooyberghs/http2_support
Http2 support
2015-10-25 12:52:29 -05:00
Jeroen Hooyberghs
e8a6d4594f change some spaces for layout reasons / second attempt 2015-10-23 22:31:34 +02:00
Jeroen Hooyberghs
34ed122a71 change some spaces for layout reasons 2015-10-23 22:27:09 +02:00
Jeroen Hooyberghs
8391ab0fc7 add http2 as possible param for a vhost 2015-10-23 22:16:11 +02:00
Daniel Hopper
7df1b40475 Adding support for stream configuration 2015-10-08 15:50:46 -04:00
Patrick Brideau
2fcc2306ad iterate server_name when rewrite_www_to_non_www is used 2015-09-15 11:58:17 -04:00
Simon Vigneux
27ec19164d adding a max_fails parameter to upstream member[s] 2015-09-01 16:24:28 -04:00
Matthew Haughton
01f914df3d Merge pull request #660 from 3flex/ssl_performance_directives
vhost: add ssl_buffer_size to SSL config
2015-07-11 20:37:16 -04:00
Matthew Haughton
7478d4fafd vhost: add ssl_buffer_size to SSL config 2015-07-11 19:53:30 -04:00
Matthew Haughton
35577ccc88 add remaining gzip directives
Closes #367
2015-07-11 17:07:56 -04:00
Matthew Haughton
d1b0908f0c Merge pull request #652 from pulecp/master
update default SSL ciphers
2015-07-09 10:50:28 -04:00
Christian Groschupp
203235199b sort add_header values for ssl vhost 2015-07-08 16:44:05 +02:00
Pavel Pulec
6813755076 update default SSL ciphers 2015-06-24 11:34:59 +02:00
John Daniels
10f7710e8d Moved conf.d/proxy.conf into nginx.conf. 2015-06-12 09:38:06 -04:00
Jacob McCoy Wade
66524e22b4 Adding ability to add proxy_cache_use_stale and proxy_cache_key within a location resource
Adding spec tests for proxy_cache_key and proxy_cache_use_stale
2015-06-01 14:32:26 -07:00
Matthew Haughton
678a361106 vhost: add ssl_crl parameter 2015-05-09 00:51:49 -04:00
Matthew Haughton
be4decdb78 vhost: don't copy any SSL files 2015-05-09 00:40:57 -04:00
Marin Vintila
77aa952b20 Merge from master 2015-05-08 12:11:46 +03:00
Marin Vintila
5624e4ca55 Merge from master 2015-05-08 12:04:22 +03:00
Joe Hillenbrand
2ff640d5dd Include ssl settings in rewrite_www server.
fixes jfryman/puppet-nginx#542
2015-05-07 12:35:09 -07:00
Michael Marod
7e524d0785 change variable names as requested to match nginx params exactly... Also passenger_env_var is not set with passenger_set_env_var and this commit undoes that 2015-04-29 17:37:58 -04:00
Michael Marod
d0464923d1 Add passenger_env_var parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:33:42 -04:00
Michael Marod
0aed6c1978 Add passenger_header parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:24:38 -04:00
Matthew Haughton
c78ef6e4f7 fastcgi_params: adjust whitespace for consistency 2015-04-15 14:15:45 -04:00
Matthew Haughton
b65080c625 Merge pull request #605 from 3flex/600-make-auth-available-everywhere
location: move auth_basic directives to header
2015-04-14 11:05:46 -04:00
Matthew Haughton
f18e83f4b0 vhost: simplify maintenance variable code 2015-04-13 23:02:48 -04:00
Matthew Haughton
3027d9f35a location: move auth_basic directives to header
Allows setting these directives on any location:
* auth_basic
* auth_basic_user_file
2015-04-13 22:58:57 -04:00
James Fryman
2354132aa9 Merge pull request #584 from brunoleon/maintenance
feat (maintenance): allow to specify maintenance behavior. Add docs.
2015-03-26 07:06:29 -05:00
Bruno Léon
6f1744b11d feat (maintenance): allow to specify maintenance behavior. Add docs. 2015-03-24 15:45:29 +01:00
James R. Carr
e333db6c39 provides ssl_client_verify support 2015-03-23 13:59:30 -05:00
Bruno Léon
c18ba1d499 feat: add an easy maintenance page support 2015-03-17 17:06:54 +01:00
James Fryman
3322fb5a0e Merge pull request #574 from railsdog/prachetasp/nginx_cfg_prepend
Prepend to the nginx config block
2015-03-09 10:15:06 -05:00
James Fryman
2c52e08925 Merge pull request #546 from b4ldr/master
allow listen_ip and ipv6_listen_ip to contain a String or Array
2015-02-05 14:09:29 -06:00
James Fryman
a212b4855b Merge pull request #549 from asgoodasnu/redirect_with_params
do www-rewrite with params
2015-02-05 14:08:15 -06:00
James Fryman
5f932dcb2b Merge pull request #551 from sbaryakov/master
sort add_header values for vhost
2015-02-05 14:06:36 -06:00
James Fryman
e84b55ed1b Merge pull request #561 from Jimdo/fastcgi_param_ordering
Sort fastcgi params to have stable ordering
2015-02-05 14:03:49 -06:00
Mathias Lafeldt
cfdd74436e Sort fastcgi params to have stable ordering
The hash sorting was started in #532 and this fixes it for fastcgi as
well.
2015-02-05 11:48:58 +01:00
Stefan Baryakov
d909327380 sort add_header values for vhost 2015-01-23 14:33:49 +01:00
paschdan
8acfac5b6d do www-rewrite with params 2015-01-19 17:14:46 +01:00
b4ldr
fdca7199f6 allow listen_ip and ipv6_listen_ip to contain a String or Array 2015-01-13 20:44:58 +00:00
James Fryman
d42695cf86 Merge pull request #532 from mbornoz/hash-ordering
Sort sub hash keys to have a stable ordering
2014-12-30 10:30:40 -06:00
Prachetas Prabhu
ce407aa06d Remove spaces form nginx erb prepend block 2014-12-26 17:16:12 +00:00
Prachetas Prabhu
519f17a55e Adds a parameter to prepend configuration elements to the main nginx.conf file 2014-12-26 16:54:26 +00:00
Matthew Haughton
be30b57531 Merge pull request #531 from ckaenzig/optional-proxy-http-version
Allow disabling proxy_http_version directive
2014-12-18 10:08:52 -05:00
Mathieu Bornoz
9c4e1e2ffb Sort sub hash keys to have a stable ordering 2014-12-17 09:20:24 +01:00
Christian Kaenzig
7432862fe8 Allow disabling proxy_http_version directive
The EPEL 6 repository still has version 1.0.15 which does not support
this directive proxy_http_version. Yes, this version is old, but a lot
of people prefer not to use a bleeding edge version from nginx.org.
2014-12-16 17:27:34 +01:00
James Fryman
10d5f196d7 Merge pull request #526 from asgoodasnu/rewrites_in_fastcgi
moves rewrite_rules to location_header
2014-12-11 09:52:24 -08:00