Commit graph

117 commits

Author SHA1 Message Date
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
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
Matthew Haughton
99e9d82f12 accept boolean for ipv6_enable as documented 2013-11-21 23:18:04 -05:00
Matthew Haughton
e1c4c7470b sort vhost_cfg_append in vhost_ssl_footer 2013-11-21 23:08:36 -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
Matthew Haughton
ef2a5e4f15 fix syntax of allow/deny directives 2013-11-21 22:35:44 -05:00
Matthew Haughton
3024f2927d fix IPv6 address fact detection 2013-11-21 22:32:23 -05:00
Tomas Barton
4e41871dac fixed acces to vhost_cfg_append via instance variable 2013-09-30 00:46:17 +02:00
Tomas Barton
82ce9223a9 possibility to disable default location 2013-09-29 20:53:25 +02:00
Tomas Barton
2cc0a2fcf0 support ssl_cache and for passenger cgi params 2013-09-29 20:36:19 +02:00
James Fryman
315d7e109f Merge pull request #120 from abraham1901/dev
Aggregated some PR & tested & simple bug fix & add new option
2013-09-15 17:29:56 -07:00
James Fryman
6f2eb74558 Merge pull request #140 from alanpearce/patch-1
Fix deprecated variable access warning in vhost footer template
2013-09-15 17:26:14 -07:00
Todd Eddy
9252351986 Fix stub_status location so it has line breaks. 2013-09-14 04:24:01 -04:00
Alan Pearce
05c260a963 Fix deprecated variable access warning in vhost footer template 2013-09-13 15:29:50 +01: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
James Fryman
59106eae7c Merge pull request #128 from leoc/fix-www-rewrite-port
Use correct port for www rewrite
2013-09-06 08:44:49 -07:00
Lebedev Vadim
757bb87031 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/params.pp
	manifests/resource/location.pp
	manifests/resource/vhost.pp
	templates/vhost/vhost_header.erb
2013-09-05 12:01:00 +04:00
Lebedev Vadim
4f27265047 remove each_line 2013-09-05 11:43:44 +04:00
Ashley Penney
39bc3f16ac This commit addresses issue #49, the lack of ways to set allow and
deny rules within a location.
2013-09-04 13:04:28 -04:00
Arthur Leonard Andersen
6934271b85 Use correct port for www rewrite 2013-09-03 23:42:16 +02:00
James Fryman
43d2e86a20 Merge pull request #123 from jhoblitt/sort_vhost_cfg_append
sort $vhost_cfg_append hash in vhost_footer.erb template
2013-09-03 08:08:20 -07:00
Theo Spears
2170297c87 Fix typo in vhost_header 2013-08-31 19:09:58 +01:00
Joshua Hoblitt
df4243491e sort $vhost_cfg_append hash in vhost_footer.erb template
This is so the paremter ordering in the configuration is stable. It also
force the :allow key (if it exists) to be first in the sort ordering.
It would probably be better to change `$vhost_cfg_append` into an array
of one key hashes but would require a public API change.
2013-08-28 10:14:13 -07:00
Lebedev Vadim
1efc72b53a * Bug fix, remove each_line method 2013-08-23 12:58:43 +04:00
Lebedev Vadim
15519e7eef Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/package/redhat.pp
	templates/vhost/vhost_footer.erb
	templates/vhost/vhost_header.erb
2013-08-23 01:07:53 +04:00
James Fryman
bd57348454 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-08-22 15:44:51 -05:00
James Fryman
e1aa65d20c Manual merge of https://github.com/jfryman/puppet-nginx/pull/100 2013-08-22 15:44:25 -05:00
James Fryman
b246c13285 Merge pull request #104 from stephenrjohnson/vhost_template_cleanup
fix template, should use @
2013-08-22 13:39:59 -07:00
root
f609f9601d Adding option http_cfg_prepend to class nginx 2013-08-22 23:02:04 +04:00
root
0a53d710c2 Merge branch 'sort_vhost_cfg_append' of https://github.com/jhoblitt/puppet-nginx into dev 2013-08-22 22:24:55 +04:00
Joshua Hoblitt
b8189496a3 sort $vhost_cfg_append hash in vhost_footer.erb template
This is so the paremter ordering in the configuration is stable. It also
force the :allow key (if it exists) to be first in the sort ordering.
It would probably be better to change `$vhost_cfg_append` into an array
of one key hashes but would require a public API change.
2013-08-16 16:29:05 -07:00
Abdoul Bah
b40196f843 Update vhost_location_stub_status.erb
this does not affect ruby1.9
2013-08-15 21:08:03 +02:00