Commit graph

235 commits

Author SHA1 Message Date
gerases
83043627f5 Remove extra white space 2016-01-20 15:29:17 -06:00
matt.cover
57a42466cf Add unix socket for listening. 2015-10-30 12:14:47 -07: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
Patrick Brideau
2fcc2306ad iterate server_name when rewrite_www_to_non_www is used 2015-09-15 11:58:17 -04:00
Matthew Haughton
7478d4fafd vhost: add ssl_buffer_size to SSL config 2015-07-11 19:53:30 -04:00
Christian Groschupp
203235199b sort add_header values for ssl vhost 2015-07-08 16:44:05 +02: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
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
Mathieu Bornoz
9c4e1e2ffb Sort sub hash keys to have a stable ordering 2014-12-17 09:20:24 +01: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
Sebastian Brückner
8f793211a5 Fix proxy_set_header for default location 2014-12-04 11:27:48 +01: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
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