Commit graph

275 commits

Author SHA1 Message Date
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
James Fryman
8203f55894 Merge pull request #310 from kalmanolah/rewrite_non_www
Use first server name for non-www redirects to prevent issues with naming of vhosts within defined types.
2014-06-25 21:10:36 -05:00
eholzbach
7a91ff4c2e allow setting gzip_types to vhosts 2014-06-25 13:58:55 -07:00
eholzbach
508e9e8d62 allows setting client_body/header_timeout on vhosts 2014-06-25 11:55:26 -07:00
Kalman Olah
12d515f7f7 Use first server name for non-www redirects to prevent issues with naming of vhosts within defined types.
Signed-off-by: Kalman Olah <kalman@inuits.eu>
2014-06-24 19:22:43 +02:00
Carl P. Corliss
9b14ba901e add ability to designate location as internal 2014-06-24 10:42:27 -04:00
James Fryman
400e58a505 Merge pull request #347 from rabbitt/feature/upstream-exports
Reintegrate jfryman/puppet-nginx#331 (upstream exports/collections)
2014-06-24 09:31:19 -05:00
James Fryman
473ed04463 Merge pull request #354 from janorn/temp_paths
Add client_body_temp_path and proxy_temp_path to proxy.conf.
2014-06-24 09:27:18 -05:00
Jan Örnstedt
ebd2a6a608 Add client_body_temp_path and proxy_temp_path to proxy.conf. 2014-06-24 00:33:56 +02:00
Carl P. Corliss
33303102fc refactor locations to remove a bit of redundancy 2014-06-23 17:41:21 -04:00
James Fryman
b0a1df32c2 Merge pull request #349 from rabbitt/feature/return-instead-of-rewrite
use 'return' over 'rewrite'
2014-06-23 12:42:43 -05:00
Carl P. Corliss
9519298aba use return instead of rewrite for simple redirects (e.g., www -> naked domain) 2014-06-23 11:46:43 -04:00
Carl P. Corliss
9cf983504a Reintegrate jfryman/puppet-nginx#331 (upstream exports/collections)
- resurrecting jfryman/puppet-nginx#331 from @rainopik
- update (concat/stdlib) dependency version requirements based on current usage
- fix upstream tests to work with rainopik's changes in what was jfryman/puppet-nginx#331
2014-06-21 12:36:28 -04:00
Maksym Melnychok
5b28d0553d configuration revamp
- make many more things configurable
- stop using ::params::* for things that are configurable
- add worker_rlimit_nofile option
- add tcp_nopush option
2014-06-21 11:08:29 +02:00
Robin Gloster
3387346d4b Make sendfile configurable
Conflicts:
	manifests/init.pp
2014-06-20 16:09:02 +02:00
James Fryman
03094eabe5 Merge pull request #337 from rabbitt/master
add ability to define geo and map mappings
2014-06-16 09:43:15 -05:00
Jan Örnstedt
7459e91744 Made config dir available as a parameter. 2014-06-13 13:51:45 +02:00
Carl P. Corliss
d3810eb61c add geo and map mappings 2014-06-12 14:12:24 -04:00
Lee Packham
2a5e81feb5 Revert "Added ngnix::resources::upstream::member"
Upstream members can no longer be exported and collected.

The change in #331 was fundamentally broken. I have therefore reverted
it as it shouldn't of been merged.

Essentially you can't use ensure with this change - meaning you can no
longer REMOVE an nginx config from the system - which is part of the
tests and also sane module practice.

The idea was nice - but the implementation broke things. This reverts
back to a good state, without modifying any tests where tests pass again
with the recent commits.

This reverts commit ebf3e4e58e.
2014-06-12 10:08:59 +01:00
James Fryman
9c7cf2d182 Merge pull request #328 from janorn/run_as_unprivileged
Run as unprivileged user
2014-06-11 12:55:12 -05:00
James Fryman
3691e83685 Merge pull request #334 from multiplay/fixtests_only
Fix all rspec tests so they run
2014-06-11 12:46:33 -05:00
James Fryman
70e772ed40 Merge pull request #332 from kimor79/master
Allow format_log in ssl vhosts as well
2014-06-11 12:29:59 -05:00
James Fryman
6107c768f1 Merge pull request #331 from rainopik/master
Upstream members can be exported and collected
2014-06-11 12:12:23 -05:00
James Fryman
04b78c416d Merge pull request #330 from saz/master
make ssl listen option configurable
2014-06-11 11:31:07 -05:00
Lee Packham
8eb26b792b Fix all rspec tests so they run
For some reason these have been broken forever. Travis was failing,
correctly. I have updated the tests to be correct to how the code
actually works.

I would also suggest that if this is merged, we stop merging PRs that
have failed test runs. Tests matter in a module like this.
2014-06-10 22:10:00 +01:00
Kimo Rosenbaum
5495bd2617 Allow format_log in ssl as well 2014-06-09 15:49:33 -07:00
Rain Öpik
ebf3e4e58e Added ngnix::resources::upstream::member. Upstream members can now be exported and collected. 2014-06-06 21:56:29 -04:00
Jan Örnstedt
f5a12bdb33 Add super_user option to be able to launch nginx as unprivileged user without complains. 2014-06-04 23:28:32 +02:00
Jan Örnstedt
8613a52be9 Added 4 proxy parameters.
client_body_buffer_size
proxy_connect_timeout
proxy_read_timeout
proxy_send_timeout

And reference these variabels in the template.
2014-06-04 22:19:10 +02:00
Jan Örnstedt
ba72229437 Replaced params references with config. 2014-06-04 22:19:10 +02:00