Commit graph

208 commits

Author SHA1 Message Date
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
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
eSe
2271ce5255 Fix indent for location parameters to 4 spaces 2014-03-12 17:18:05 +01:00
Daniel Black
5829559aca add hash/array support for upstream_cfg_prepend 2014-03-12 19:06:47 +11:00
eSe
0ade406a89 Remove Arrays as keys in templates 2014-03-11 17:24:30 +01:00
eSe
7614bceec1 Fix custom_cfg_[prepend,append] 2014-03-10 12:52:12 +01:00
eSe
3ef66c6f63 Fix formatting errors 2014-03-10 10:26:35 +01:00
eSe
dd898c2a0a Fix syntax errors 2014-03-09 20:46:13 +01:00
Daniel Black
36f63ccc16 location_custom_cfg_{prepend,append} for vhost_location_alias 2014-03-08 12:32:40 +11:00
Daniel Black
4f8096c52c Extend hash based host_cfg_{ssl_,}{prepend,append} to vhost_{ssl_,}{header,footer}. fix vhost_location_alias/vhost_location_directory. Add {location_custom_cfg_prepend,append} to vhost_location_fastcgi, vhost_location_proxy and vhost_location_stub_status. 2014-03-08 12:16:07 +11:00
Daniel Black
fdc05942f5 vhost_location_directory merge fix - missing end 2014-03-08 01:38:39 +11:00
Daniel Black
a66cd98ea9 Merge https://github.com/ese/puppet-nginx into hash
Resolved Conflicts:
	spec/defines/resource_location_spec.rb
	templates/vhost/vhost_location_alias.erb
	templates/vhost/vhost_location_directory.erb
	templates/vhost/vhost_location_empty.erb
	templates/vhost/vhost_location_fastcgi.erb
	templates/vhost/vhost_location_proxy.erb
	templates/vhost/vhost_location_stub_status.erb
2014-03-08 01:20:58 +11:00
Daniel Black
04e34dce39 Key value parameter maps to take array as value
Allow arrays to be specified as values in location_cfg_{prepend,append} and
vhost_cfg_{ssl_,}{prepend,append} parameters.
2014-03-07 23:53:32 +11:00
eSe
c07d99c5db Allow values to be hashes at prepend,append,custom cfg for locations 2014-03-05 17:05:46 +01:00
pessoa
ca151970e6 add location_custom_cfg_prepend support 2014-02-17 19:51:14 +00:00
James Fryman
047b88d270 Merge pull request #253 from fadenb/bug/missing_allowdeny_vhost_location_proxy
Allow location_{allow,deny} parameter to be used for proxy locations
2014-02-11 09:14:18 -06:00
Markus Rekkenbeil
971e1a7692 Update vhost_location documentation and template 2014-02-10 18:14:18 +01:00
Chris Denneen
7a83b0ebf2 Merge remote-tracking branch 'origin/patch-1'
* origin/patch-1:
  Update vhost_ssl_header.erb
2014-02-07 18:43:41 -05:00
cdenneen
41ebc1a659 Update vhost_ssl_footer.erb 2014-02-07 18:37:32 -05:00
cdenneen
4f8c71a5b6 Update vhost_ssl_header.erb
Add vhost_cfg_prepend to vhost_ssl_header
Add vhost_cfg_ssl_prepend to vhost_ssl_header
2014-02-07 18:36:30 -05:00
Tristan Helmich
05386c2b74 Allow location_{allow,deny} to be used for proxy locations 2014-02-07 13:44:23 +01:00
Tristan Helmich
15a2695442 Move ipv6only=on option from template into puppet
See jfryman#30
2014-02-03 12:54:44 +01:00
James Fryman
eeb0830b7f Merge pull request #246 from inflection/add_client_max_body_size
Adding client_max_body_size.
2014-01-28 13:08:28 -08: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
TJ Biddle
52b124e505 Adding client_max_body_size. 2014-01-28 12:52:56 -08:00
Huan Du
542cbbef2c use stable sort to ensure passenger_set_cgi_param key sequence stable. 2014-01-24 20:25:12 +08:00
Lebedev Vadim
2252d96fe8 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-21 15:22:19 +04:00
Lebedev Vadim
d340eea512 remove sort array in location_custom_cfg_* 2014-01-17 20:08:01 +04:00
Maurits Landewers
e36aa73b6e Make gzip configurable 2014-01-17 10:29:56 +01:00
Lebedev Vadim
a4ddf886b2 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-14 19:57:45 +04:00
Matthew Haughton
dc3817f9ae added rewrite to location/proxy & vhost
With credit to https://github.com/OmarzT
2014-01-13 13:20:02 -05:00
Lebedev Vadim
e94af129e4 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': }
Add example nginx::vhost with HTTPS FastCGI and redirection of HTTP
Add location_custom_cfg_prepend & location_custom_cfg_append. Used for logical structures such as if.
Fix puppet-lint
2014-01-12 23:15:14 +04: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