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
paschdan
708be8263d
moves rewrite_rules to location_header
...
so it can be used by all location-types
2014-12-11 17:43:33 +01:00
Sergio Ballesteros
4a3f7f1e31
Allow arrays values in
2014-12-11 16:17:30 +01:00
Sebastian Brückner
8f793211a5
Fix proxy_set_header for default location
2014-12-04 11:27:48 +01:00
Joshua B. Bussdieker
2e221a7e0f
Support specifying log formats
2014-12-03 23:26:10 -05:00
Cameron Wood (@cewood)
123b14edca
Reorganise whitespace in the vhost header and location header/footer.
...
The current template inserts newlines after a location, which doesn't
seem logical; one can't assume there will always be more blocks that
follow. Therefore it is only logical to include the newline before a
new location block is inserted, which lends itself to the convention
of only prepending newlines to blocks, never appending them.
2014-11-12 16:04:45 +11:00
Matthew Haughton
05ac65f3b1
vhost: treat ssl_port as integer when comparing
...
Actual fix for test failure for code introduced in abe4b49
2014-10-23 14:12:20 -04:00
Matthew Haughton
abe4b4952b
vhost: fix rewrite to HTTPS for custom SSL ports
...
Fixes #477
2014-10-23 12:51:35 -04:00
Vincent Bernat
004ee68b89
vhost: add a blank line at the end of the header template
...
Without it, we get something like this:
```
error_log /var/log/nginx/my_error.log; location / {
root /var/www/html;
}
```
With this commit, we get this:
```
error_log /var/log/nginx/my_error.log;
location / {
root /var/www/html;
}
```
2014-10-22 22:22:46 +02:00
Garrett Honeycutt
db3c4a4955
Use stronger ciphers
...
As suggested by Mozilla
https://wiki.mozilla.org/Security/Server_Side_TLS#Nginx
2014-10-16 09:23:54 -04:00
cdenneen
324179e7a4
Add include files to locations
2014-09-23 18:52:14 -04:00
James Fryman
d11d574e8c
Merge pull request #443 from rabbitt/whitespace-cleanup
...
cleanup whitespace and key/value alignment in config files
2014-09-20 10:06:59 -05:00
Frederik Wagner
331338abdb
added parameter ssl_session_timeout to vhost
2014-09-15 23:11:26 -04:00
Carl P. Corliss
fb880576a6
cleanup resultant whitespace and key/value alignment in config files
...
- fix tests related to whitespace changes
2014-09-13 04:13:18 -04:00
Pablo Fredrikson
ac1e9b70f6
Removed proxy_cache_valid as default when using proxy_cache option
...
Added some tests also
2014-09-03 18:39:55 -03:00
Matthew Haughton
bbf6f4584d
Merge pull request #413 from zshahan/enable_streaming
...
Add flv and mp4 parameters to vhost::location
2014-08-22 13:24:12 -04:00
Matthew Haughton
82398b2fd2
Merge pull request #386 from xaque208/whitespace
...
Align index to the rest of template contents
2014-08-22 11:26:49 -04:00
zshahan
68a46d3ed1
added streaming options.
2014-08-18 20:34:43 -05:00
Cory Comer
3874221ddb
Fixing deprecated variable access warning
2014-08-15 04:37:43 -07:00
Christoph Körner
9bedd7950a
Renamed params to fastcgi_param and moved to fastcgi.erb
2014-08-13 12:24:59 +02:00
Christoph Körner
a128713520
Changed description of params in comment block
2014-08-11 10:19:41 +02:00
Christoph Körner
96138715d1
Add support of custom fastcgi_params
2014-08-11 10:04:21 +02:00
Zach Leslie
5dda0ad03c
Align index to the rest of template contents
2014-07-28 14:12:42 -07:00
Carl P. Corliss
7be12d0870
new raw_prepend / raw_append feature for vhosts & locations
...
- added raw_prepend / raw_append to vhosts & locations, which
adds raw lines to the vhost/location /without/ semicolons
- added location_raw_prepend / location_raw_append to vhost
for passing through to default location
- added spec tests for new parameters
- cleaned up location specs to match new header/body/footer setup
reducing duplicate checks by testing header/footer separately.
- cleaned up whitespace (2 space) in touched files
- used `<%-` in erb templates to allow the use of leading
whitespace, making the logic flow more readable
- Also adds spec tests for recent vhost updates:
- client_body_timeout
- client_header_timeout
- gzip_types
- testing that the first server_name is used when www_to_non_www is true
2014-06-26 00:00:37 -04:00