Commit graph

63 commits

Author SHA1 Message Date
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
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
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
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
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
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
ce2bd7f068 add option for multi_accept and events_use 2014-05-31 16:06:23 +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
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
Gene Hand
ea6129bf98 Make proxy_redirect configurable 2014-03-27 14:12:18 -07:00
Joshua Moore
6fe431f698 SmartOS support 2014-03-24 17:07:38 -04:00
Joshua Moore
bbf820c09e Replaced hardcoded values with scopelookup 2014-03-20 11:40:40 -04:00
James Fryman
ff76e4f055 Merge pull request #277 from jfroche/patch-1
remove unknown parameter
2014-03-19 10:22:26 -05:00
James Fryman
8173432d82 Merge pull request #266 from ese/master
Allow values to be hashes at prepend,append,custom cfg for locations
2014-03-19 09:54:17 -05:00
Jean-François Roche
e0f716b0cf remove unknown parameter
The parameter nginx::params::nx_tcp_nopush is never defined.
2014-03-18 11:21:14 +01:00
Daniel Kerwin
d831a869fc Add setting worker_rlimit_nofile with default of 1024 2014-03-12 18:17:41 +01:00
Daniel Black
5829559aca add hash/array support for upstream_cfg_prepend 2014-03-12 19:06:47 +11:00
James Fryman
8b29715179 Merge pull request #171 from thomasbiddle/upstream_fail_timeout
Adding upstream fail_timeout.
2014-01-28 12:57:14 -08:00
Maurits Landewers
e36aa73b6e Make gzip configurable 2014-01-17 10:29:56 +01:00
Nathan Sullivan
70256dcb2a improved version of support for server_names_hash_bucket_size and server_names_hash_max_size for https://github.com/jfryman/puppet-nginx/pull/178 - also a few puppet-lint fixes 2014-01-10 13:42:16 +10:00
Matthew Haughton
a0258920d1 Fix Puppet 3.2.x deprecation warnings 2013-12-08 17:01:12 -05:00
Matthew Haughton
753283286f switch vhost resource to concat pattern
Also uses sites-available/enabled pattern for config files
2013-11-30 21:24:50 -05:00
Matthew Haughton
4af2087867 fix spacing issues in various templates
Before this change, vhost_ssl_header would merge
"ssl" with any listen options, e.g.:
    listen       *:443 ssldefault;
when listen_options => 'default'.
2013-11-21 23:04:39 -05:00
TJ Biddle
3536069f16 Adding upstream fail_timeout. 2013-10-29 11:55:40 -07:00
Daniel Kerwin
b17a8c2952 Fix upstream_cfg_prepend loop to put every element on a dedicated line 2013-10-22 23:19:34 +02:00
Lebedev Vadim
20a37a220f Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/config.pp
	manifests/resource/location.pp
2013-09-08 16:50:16 +04:00
Omar Z
4da3e46207 added proxy_buffer_size with default value of 8k 2013-09-05 23:15:45 +01:00
Omar Z
53b4986b5d make proxy_buffers configurable 2013-09-05 22:57:50 +01:00
Omar Tamer
fda2969c20 make client_max_body_size configurable 2013-09-04 17:37:18 +01:00
Todd Eddy
70207c9a65 Add logging customization to the main logs as well. 2013-08-07 21:27:13 -04:00
Lebedev Vadim
ae9303233c Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/init.pp
2013-07-21 19:40:29 +04:00
Lebedev Vadim
386026fda8 Adding option http_cfg_append to class nginx
Fix puppet-lint
2013-07-21 04:12:18 +04:00
Arthur Leonard Andersen
0191a2fe28 Fix deprecated variable names 2013-07-17 20:42:57 +02:00
Stefan Dorosz
179b1a4b5d Add server_names_hash_bucket_size param 2013-06-20 10:48:52 -04:00