Commit graph

250 commits

Author SHA1 Message Date
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
Steffen Zieger
7b80b1a3c6 make ssl listen option configurable 2014-06-02 00:23:07 +02:00
Steffen Zieger
ce2bd7f068 add option for multi_accept and events_use 2014-05-31 16:06:23 +02:00
Tim Mower
9d1e2e8806 Add client_max_body_size to ssl vhost 2014-05-27 11:38:32 +01:00
James Fryman
5056ecb899 Merge pull request #311 from alexskr/master
add location_allow/deny directives for alias and stub_status templates
2014-05-16 13:19:03 +02:00
James Fryman
8b7588dccc Merge pull request #315 from gini/basic_auth_for_proxy_locations
Allow basic_auth for proxy locations and ...
2014-05-16 13:18:01 +02:00
Edvinas Klovas
0373c8492f typo fixes & trailing whitespace cleanup 2014-05-15 23:58:44 +02:00
Edvinas Klovas
949a000e80 Add Archlinux support
This commit adds Archlinux support. This needs changes in nginx.conf.erb
template and manifests to support pid value set to `false` (this skips it from
nginx.conf). This is due to `-pid /run/nginx.pid` being hardcoded to Archlinux
template. If you specify pid additionally in `nginx.conf` then nginx fails to
start.
2014-05-15 23:55:24 +02:00
Daniel Kerwin
d11c6be681 Allow basic_auth for proxy locations and introducing parameter proxy_headers_hash_bucket_size with default of 64 2014-05-15 16:18:27 +02:00
Alex Skrenchuk
31f2cce35e add location_allow/deny directives 2014-05-14 14:34:28 -07:00
Alex Skrenchuk
874ddcac2a add location_allow/deny directives 2014-05-14 14:33:58 -07:00
James Fryman
4a5ed9ac7a Merge pull request #307 from ChartBoost/resolverfix
allow resolvers in non-ssl vhosts
2014-05-08 07:37:41 -05:00
Mike Lerch
73158c112d allow resolvers in non-ssl vhosts 2014-05-02 10:17:10 -07:00
root
402febc599 Add fastcgi_cache_key and fastcgi_cache_use_stale parameters 2014-04-27 09:49:45 -04:00
root
659a8cd4d0 add additional fastcgi parameters 2014-04-26 11:14:55 -04:00
root
024cc33d62 add support for fastcgi_cache_path 2014-04-26 10:34:29 -04:00
James Fryman
4d816c990a Merge pull request #305 from andschwa/patch-alias_autoindex
Adding autoindex to location alias
2014-04-24 11:13:07 -05:00
Andrew Schwartzmeyer
12004e86b7 Adding autoindex to location alias
Fix for issue #304

I don't see any reason why autoindex shouldn't be used with alias
directive, nor does jaybe on #nginx.
2014-04-23 22:11:21 -07:00
Harry Danes
f5fac8b245 Introduced log_by_lua and log_by_lua_file params. 2014-04-18 11:57:31 +02:00
Lebedev Vadim
7b33e458a9 * fix 2014-04-13 13:26:25 +04:00
Lebedev Vadim
19acfe0356 Add option proxy_connect_timeout
Bug fix
2014-04-12 23:17:45 +04:00
Lebedev Vadim
e1bcb3e2cb Remove duplicate location_allow & location_deny 2014-04-11 23:36:15 +04:00
Lebedev Vadim
3721ce1194 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/package/debian.pp
2014-04-11 23:16:53 +04:00
Lebedev Vadim
24c93968b3 Added location_allow & location_deny to fastcgi location 2014-04-11 19:43:54 +04:00
James Fryman
20a7ea01b1 Merge pull request #289 from b4ldr/master
Add additional config to the locations resource and fix set_header in vhost resource
2014-04-09 12:13:11 -05:00
John Bond
1b7ac9ab43 Add additional config to the locations section of config
Following parameters where added to the location resourse.  These
already existsed in the vhost resource so the same logic and defaults
where used
  * proxy_set_header
  * proxy_connect_timeout
  * proxy_redirect
2014-04-09 17:48:32 +02:00