Commit graph

1214 commits

Author SHA1 Message Date
Simon Vigneux
27ec19164d adding a max_fails parameter to upstream member[s] 2015-09-01 16:24:28 -04:00
James Fryman
979f8227bf Merge pull request #673 from kwolf/master
Add 'ensure' parameter to resource::upstream::member.
2015-08-31 10:45:57 -05:00
Kevin Wolf
b2ec36de09 Did not need the trailing ";". 2015-08-28 15:22:55 -05:00
Kevin Wolf
52a1f6e653 Add an ensure option to nginx::resource::upstream::member.
Currently there is no way to ensure => absent.  I'm using these with
stored configs to have servers register the member only, not the
upstream.  Removing them in a mis-configured incident is a bit of a
burden without ensure => absent.

Tests are passing under Ruby 2.1
2015-08-28 15:07:23 -05:00
Kevin Wolf
398d0c9ae7 Merge branch 'master' of github.com:jfryman/puppet-nginx 2015-08-28 14:59:42 -05:00
James Fryman
3d6a4ed720 Merge pull request #669 from Hufschmidt/master
Update non-hiera usage (see #536)
2015-08-11 11:02:07 -05:00
Thomas Hufschmidt
5fa81822b3 Update hiera.md
Improved wording on non-hiera example.
2015-08-11 08:38:13 +02:00
Thomas Hufschmidt
69aa88000f Update hiera.md
Improvement to non-hiera usage example. 

* Fixed potention dependendy-cicle issue with example.
2015-08-11 08:36:47 +02:00
Matthew Haughton
e710cccd4c Merge pull request #666 from PierreR/patch-4
Don't qualified call to defined resource type
2015-08-10 12:56:35 -04:00
Kevin Wolf
6d4b7f0b18 adding semi-colon to end of location_custom_cfg_append options. 2015-08-07 13:45:38 -05:00
Pi3r
44c6595ffa Don't qualified call to defined resource type
I don't think this is an valid improvement (over non qualification).

My main motivation comes from the fact that it is not currently supported so well by "language-puppet".
2015-08-07 14:29:23 +02:00
Matthew Haughton
01f914df3d Merge pull request #660 from 3flex/ssl_performance_directives
vhost: add ssl_buffer_size to SSL config
2015-07-11 20:37:16 -04:00
Matthew Haughton
3375223bc5 Merge pull request #659 from 3flex/gzip_enhancements
add remaining gzip directives
2015-07-11 20:37:08 -04:00
Matthew Haughton
7478d4fafd vhost: add ssl_buffer_size to SSL config 2015-07-11 19:53:30 -04:00
Matthew Haughton
35577ccc88 add remaining gzip directives
Closes #367
2015-07-11 17:07:56 -04:00
Matthew Haughton
d1b0908f0c Merge pull request #652 from pulecp/master
update default SSL ciphers
2015-07-09 10:50:28 -04:00
Matthew Haughton
9ef5ec1ba2 Merge pull request #658 from gujaws/feature_sort_ssl_header
sort add_header values for ssl vhost
2015-07-09 10:34:17 -04:00
Christian Groschupp
203235199b sort add_header values for ssl vhost 2015-07-08 16:44:05 +02:00
Matthew Haughton
c1563a7eb3 readme: fix example to reflect SSL key management changes
Thanks @yarikdot

https://github.com/jfryman/puppet-nginx/issues/638#issuecomment-118164472
2015-07-02 21:04:06 -04:00
Pavel Pulec
6813755076 update default SSL ciphers 2015-06-24 11:34:59 +02:00
James Fryman
af1f9cad39 bumping version to 0.2.7 2015-06-17 17:01:53 -07:00
Matthew Haughton
110b8bbdbc Merge pull request #642 from jd-daniels/master
Allow better control of http level proxy directives
2015-06-15 11:11:11 -04:00
John Daniels
310ed828c2 Adjusted tests for proxy variables. 2015-06-15 10:03:27 -04:00
Matthew Haughton
a3644ca037 Merge pull request #643 from jfryman/revert-624-master
Revert "Require base folder for resources"
2015-06-12 22:19:49 -04:00
Matthew Haughton
adcdef6f08 metadata: stick to puppetlabs-concat 1.x
The puppetlabs-concat 2.x series has been yanked. Since we don't know what
format the new module will take, we should not declare compatibility with it.

See https://groups.google.com/forum/#!topic/puppet-users/4_Sxrfl4uUY

Reverts 4fd696f
2015-06-12 22:17:05 -04:00
Matthew Haughton
7733db5432 Revert "Require base folder for resources" 2015-06-12 22:05:09 -04:00
John Daniels
10f7710e8d Moved conf.d/proxy.conf into nginx.conf. 2015-06-12 09:38:06 -04:00
Matthew Haughton
e87bdfafda Merge pull request #635 from geoffgarside/create-log-files
Create directory for log files
2015-06-03 22:51:17 -04:00
Jacob McCoy Wade
3b21779bfc removing proxy_cache_path_hash from nginx::config and adding validation for either
has or string for proxy_cache_path

made the conditional test to use is_a?(Hash) for simplicity's sake in
templates/conf.d/nginx.conf.erb
2015-06-03 14:45:19 -07:00
Jacob McCoy Wade
4d93e049ca Adding ability to add proxy_cache_use_stale and proxy_cache_key within a location resource
Adding spec tests for proxy_cache_key and proxy_cache_use_stale
2015-06-03 14:44:47 -07:00
Matthew Haughton
24d8d4d5c5 metadata: allow for puppetlabs-concat 2.0.0 2015-06-03 14:44:47 -07:00
Geoff Garside
27334c1bd4 Manage the nginx log directory.
Ensure the nginx::config::log_dir exists so that the access.log and error.log can be created. Also any nginx::vhost also put their access/error logs in this directory as well. This is done so that on platforms where /var/log/nginx is not created by package installation it exists so that nginx can startup and create the log files.

When vhost purge is enabled the log directory will not be touched and the log files will remain.
2015-06-03 20:43:52 +01:00
Jacob McCoy Wade
75b21a5192 Merge branch 'proxy_cache_path' of github.com:jacobmw/puppet-nginx into proxy_cache_path 2015-06-02 11:03:26 -07:00
Jacob McCoy Wade
876713f895 Adding ability to specify multiple proxy_cache_path entries with unique
proxy_cache_keys_zone values
2015-06-02 11:01:45 -07:00
Jacob McCoy Wade
f92b895cb9 Adding a version of proxy_cache_path that will work with either a hash
value or a string value
2015-06-02 10:50:11 -07:00
Jacob McCoy Wade
16d76a9c15 Adding proxy_cache_path_hash flag in order to use either a string or
hash value
2015-06-02 10:48:57 -07:00
Matthew Haughton
517dba1cd9 Merge pull request #636 from jacobmw/vhost_cache
Vhost and loation proxy_cache_key and proxy_cache_use_stale
2015-06-02 10:30:15 -04:00
Jacob McCoy Wade
66524e22b4 Adding ability to add proxy_cache_use_stale and proxy_cache_key within a location resource
Adding spec tests for proxy_cache_key and proxy_cache_use_stale
2015-06-01 14:32:26 -07:00
Matthew Haughton
4fd696fa53 metadata: allow for puppetlabs-concat 2.0.0 2015-06-01 12:02:26 -04:00
Matthew Haughton
796bf63893 Merge pull request #624 from Tombar/master
Require base folder for resources
2015-05-26 12:05:09 -04:00
Matthew Haughton
f3d6fa5f53 Merge pull request #545 from sanoma-technology/default_location_fix
Prevent missing resource errors if custom configuration is used without default location
2015-05-20 13:05:05 -04:00
Steve Maddison
62c8a1e558 Simplify default vhost configuration by passing parameters directly to resource.
Prevent missing resource errors if custom configuration is used without default location.
2015-05-20 12:38:20 +02:00
Matthew Haughton
c092c5a92a Merge pull request #632 from jfryman/update-upstream-tests
spec: update upstream_spec for puppetlabs-concat 2
2015-05-19 12:24:01 -04:00
Matthew Haughton
c143078763 spec: update upstream_spec for puppetlabs-concat 2 2015-05-19 11:55:41 -04:00
Steve Maddison
58ef49662d Merge pull request #1 from jfryman/master
Merge upstream changes
2015-05-19 14:22:28 +02:00
Matthew Haughton
9d456955c2 Merge pull request #623 from 3flex/599-ssl-updates
SSL updates
2015-05-12 13:34:06 -04:00
Matthew Haughton
678a361106 vhost: add ssl_crl parameter 2015-05-09 00:51:49 -04:00
Matthew Haughton
be4decdb78 vhost: don't copy any SSL files 2015-05-09 00:40:57 -04:00
James Fryman
086510c520 Merge pull request #398 from syscollective/master
Add uwsgi support
2015-05-08 10:12:40 -05:00
Marin Vintila
a8cb664ef5 Fix uwsgi related tests 2015-05-08 18:00:35 +03:00