opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1198 commits 2 branches 0 tags 1.4 MiB
Commit graph

343 commits

Author SHA1 Message Date
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
Marin Vintila
1172268a18 Sync repo from upstream 2014-08-12 19:06:13 +03: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
Marin Vintila
2778df07fb Add uwsgi support 2014-06-24 19:17:08 +03: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
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
James Fryman
e95a3abd46 Merge pull request #282 from genehand/master 
Make proxy_redirect configurable
 2014-04-06 09:42:49 -05:00
Paul de Raaij
1fbfe531b7 Add configuring multiple resolvers via an array instead of a string 2014-04-03 11:59:47 +02:00
Gene Hand
ea6129bf98 Make proxy_redirect configurable 2014-03-27 14:12:18 -07:00
James Fryman
ac0f4ca940 Merge pull request #280 from ok-devalias/master 
SmartOS support
 2014-03-24 17:15:13 -05:00
Joshua Moore
6fe431f698 SmartOS support 2014-03-24 17:07:38 -04:00
Robin Gloster
08d46d02cb Add allow/deny rules to fastcgi template 2014-03-22 01:23:38 +01:00
Joshua Moore
bbf820c09e Replaced hardcoded values with scopelookup 2014-03-20 11:40:40 -04:00