Commit graph

147 commits

Author SHA1 Message Date
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
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
d340eea512 remove sort array in location_custom_cfg_* 2014-01-17 20:08:01 +04: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
Chris D'Ambrosio
78e025b250 Fix index_files ivar warning
Fix the index_files instance variable deprecation warning.
2014-01-05 22:44:54 -08:00
Omar Tamer
1566daa60f added rewrite to location/proxy & vhost 2014-01-02 18:13:59 +00:00
James Fryman
64c055ce38 revert #218 /cc https://github.com/jfryman/puppet-nginx/pull/218#issuecomment-31458745 2014-01-02 09:49:58 -06:00
Andreyev Dias de Melo
44cf3d4b2b Separating the options to avoid invalid one like "ssldefault" 2014-01-02 11:10:52 -02:00
Harry Danes
1d90dacfb3 Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam
Conflicts:
	manifests/resource/vhost.pp
2013-12-30 18:33:53 +01:00
James Fryman
96475098eb Merge pull request #214 from hdanes/master
Fix warning: Variable access via 'index_files' is deprecated.
2013-12-30 09:14:35 -08:00
Harry Danes
334ebde9b6 Fix warning: Variable access via 'index_files' is deprecated. Use '@index_files' instead. 2013-12-29 16:13:17 +01:00
Harry Danes
d0c3168592 Implementation of the resolver parameter. 2013-12-29 15:48:32 +01:00
Harry Danes
1aff2eabcb Implementation for the ssl_stapling_* parameters. 2013-12-29 15:39:21 +01:00
Harry Danes
3db6a726cb Add support for Diffie-Hellman parameters in VHOST resource. 2013-12-27 09:10:11 +01:00
Lebedev Vadim
611c80f75e Fixed the ability to disable the index_files 2013-12-25 04:13:22 +04:00
James Fryman
7d1540b3bb Merge pull request #208 from hdanes/add_header
Add the possibility to add a header to the HTTP response
2013-12-24 10:50:29 -08:00
Harry Danes
fcf11a8b18 Add the possibility to add a header to the HTTP response when response code is equal to 200, 204, 301, 302 or 304. 2013-12-24 13:07:58 +01:00
James Fryman
ee70673935 Merge pull request #204 from openquery/index_files_to_serverlevel
index_files to be defined at server level if specified in resource::vhost
2013-12-19 06:59:43 -08:00
Daniel Black
f338f304c5 Force index_files to Array before iteration in templates 2013-12-19 15:51:59 +10:00
James Fryman
5fa314114d Merge pull request #202 from openquery/vhost_ssl_normalisation
Add proxy_set_header to vhost_ssl_header to be the same as vhost_header
2013-12-18 21:27:06 -08:00
Daniel Black
520eb23ffd index_files to be defined at server level if specified in resource::vhost
This partially avoids pitfall #2 (http://wiki.nginx.org/Pitfalls)
2013-12-19 09:07:56 +10:00
Daniel Black
b7132bc10a ipv6 port to ssl_port with ssl and spdy (if enabled) options. Closes gh-198 2013-12-19 08:54:03 +10:00
Daniel Black
f26943540a Add proxy_set_header to vhost_ssl_header to be the same as vhost_header 2013-12-19 08:47:49 +10:00
Markus Rekkenbeil
b79259ed8b Add nginx autoindex to resource nginx::location and style up the
nginx::vhost directory template

Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
2013-12-16 17:36:24 +01:00
Markus Rekkenbeil
b7986f3dc3 Add nginx::vhost option 'autoindex'
Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
2013-12-12 17:27:29 +01:00
Matthew Haughton
a0258920d1 Fix Puppet 3.2.x deprecation warnings 2013-12-08 17:01:12 -05:00
Dominik Richter
709c25e82e simplified checks if variables are set in vhost_location_proxy template
kudos to Matthew Haughton for this suggestion

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2013-11-27 19:56:04 +01:00
Dominik Richter
a83c513ac4 feature: add configurable proxy_set_body to vhost and location resources
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2013-11-27 15:12:56 +01:00
Dominik Richter
a578dcea50 feature: add configurable proxy_method to vhost and location resources
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2013-11-27 15:12:56 +01:00
Matthew Haughton
43d628d4f0 fix auth_basic/auth_basic_user_file variable detection 2013-11-21 23:22:01 -05:00