Commit graph

591 commits

Author SHA1 Message Date
James Fryman
71b81bf7fd Merge pull request #215 from 3flex/fix-broken-test
Update tests broken by merging #203
2013-12-30 10:18:37 -08:00
James Fryman
797c06d993 Merge pull request #216 from 3flex/patch-1
Fix "invalid byte sequence in UTF-8" errors introduced in #213
2013-12-30 10:13:59 -08:00
Matthew Haughton
0b93c0cebe Fix "invalid byte sequence in UTF-8" errors 2013-12-30 13:03:55 -05:00
Matthew Haughton
d973000dfd Update tests broken by merging #203 2013-12-30 12:44:19 -05:00
James Fryman
2b192933db Merge pull request #212 from hdanes/ssl_dhparam
Add support for Diffie-Hellman (SSL) parameters in VHOST resource.
2013-12-30 09:39:41 -08: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
James Fryman
bf5b06792b Merge pull request #213 from hdanes/ssl_stapling
Added support for SSL stapling of OCSP responses.
2013-12-30 09:14:08 -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
James Fryman
d5ecd5368c Merge pull request #211 from abraham1901/dev
Fixed the ability to disable the index_files
2013-12-25 06:57:51 -08:00
Lebedev Vadim
611c80f75e Fixed the ability to disable the index_files 2013-12-25 04:13:22 +04:00
James Fryman
d53be0fd05 Merge pull request #210 from abraham1901/dev
Bugfix: Fixed location containing '\', such as '~ \.php$'
2013-12-24 14:45:46 -08:00
Lebedev Vadim
658b25fe30 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2013-12-25 02:40:22 +04:00
Lebedev Vadim
fc6d66fa0b Fixed location containing '\', such as '~ \.php$' 2013-12-25 02:36:01 +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
e0b8cb5f3f Implemented input validation - type hash - for the (optional) add_header parameter. 2013-12-24 19:47:15 +01:00
James Fryman
69b77d710a Merge pull request #209 from abraham1901/dev
Bugfix: Fixed long names virtual hosts
2013-12-24 10:43:25 -08:00
Lebedev Vadim
d9d77837e8 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': } 2013-12-24 21:22:32 +04: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
56618069e6 Merge pull request #206 from 3flex/travis-badge-in-README
provide visibility of Travis status
2013-12-23 06:34:42 -08:00
Matthew Haughton
5777830323 provide visibility of Travis status 2013-12-20 10:06:23 -05: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
James Fryman
cf7fec590a Merge pull request #203 from openquery/vhost_port_normalisation
ipv6 port to ssl_port with ssl and spdy (if enabled) options
2013-12-18 21:25:34 -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
James Fryman
b61c745012 Merge pull request #197 from elmerfud/master
Fix for order statements. Concat requires strings
2013-12-17 21:06:19 -08:00
Jason Clark
c7566d9134 Fix for order statements. Concat requires strings 2013-12-17 22:12:31 -06:00
James Fryman
df8df800eb Merge pull request #195 from bionix/bionix_autoindex_locations
Add nginx autoindex to resource nginx::location and style up the nginx::vhost directory template
2013-12-17 10:51:34 -08: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
James Fryman
1233413bc2 Merge pull request #194 from bionix/bionix_autoindex
Add nginx::vhost option 'autoindex'
2013-12-12 12:56:41 -08: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
James Fryman
3db9511779 Merge pull request #192 from 3flex/rspec-puppet-1.0.0
rspec-puppet 1.0.0
2013-12-09 07:07:25 -08:00
James Fryman
4ae2f81b8f Merge pull request #175 from 3flex/fix-template-deprecations
(maint) Fix Puppet 3.2.x deprecation warnings
2013-12-09 07:06:50 -08:00
Matthew Haughton
8bd2acb344 remove deprecated rspec-system-serverspec includes
See https://github.com/puppetlabs/rspec-system-serverspec/pull/11
2013-12-08 17:09:03 -05:00
Matthew Haughton
a0258920d1 Fix Puppet 3.2.x deprecation warnings 2013-12-08 17:01:12 -05:00
Matthew Haughton
7d9d69c0bc add new compile matcher 2013-12-08 16:54:25 -05:00
Matthew Haughton
17baf0861c add relationship matchers 2013-12-08 16:54:25 -05:00
Matthew Haughton
fb46e3b8cb refactor nginx_spec 2013-12-08 16:54:25 -05:00
Matthew Haughton
58b5f52685 more stringent tests for config file resources 2013-12-08 16:54:25 -05:00
Matthew Haughton
26d904c946 use new 'without_content' matcher 2013-12-08 16:54:20 -05:00
Matthew Haughton
37c12b8cb4 use new count matchers in params class 2013-12-07 13:39:24 -05:00
Matthew Haughton
36319cd5e0 set default facts for all manifests 2013-12-07 13:39:24 -05:00
Matthew Haughton
db68cf39ae include_class is deprecated 2013-12-07 13:39:24 -05:00
Matthew Haughton
23150bf8c2 boost rspec-puppet version 2013-12-07 12:34:05 -05:00