Commit graph

784 commits

Author SHA1 Message Date
James Fryman
a5592d4303 Delete LICENSE 2014-09-08 14:18:03 -05:00
James Fryman
0345068555 Create LICENSE.md
Fixes https://github.com/jfryman/puppet-nginx/issues/441
2014-09-08 14:17:54 -05:00
James Fryman
d8d116c9ed Merge pull request #438 from 3flex/future-parser
Test with future parser
2014-09-05 09:39:48 -05:00
Matthew Haughton
a002d8932e bug fixes surfaced by future parser
* concat::fragment requires 'order' to be a string
* init parameters added in #373 referred to wrong variable name in params.pp
* cannot perform regex match on a number, so make {fastcgi,proxy}_cache_levels
  a string by default
* bug fixed in test suite
2014-09-04 23:24:14 -04:00
Matthew Haughton
c3d1149da9 add Puppet future parser to Travis matrix
Only Puppet 3.5 for now; rspec-puppet doesn't work with anything higher.
Allow failures since future parser is still pre-release.
2014-09-04 23:08:02 -04:00
Matthew Haughton
5c4051054b Merge pull request #434 from pablokbs/proxy_cache_valid_fix
Removed proxy_cache_valid as default when using proxy_cache option
2014-09-03 17:54:00 -04:00
Pablo Fredrikson
ac1e9b70f6 Removed proxy_cache_valid as default when using proxy_cache option
Added some tests also
2014-09-03 18:39:55 -03:00
Matthew Haughton
a931ef511d Merge pull request #382 from 3flex/294-fix-proxy_cache_levels-validation
Correct validation of {proxy,fastcgi}_cache_levels
2014-09-03 16:47:37 -04:00
Matthew Haughton
8a7aeb8ab6 bump puppet-lint version to 1.0.1
Required for .puppet-lint.rc and puppet-lint control comments
2014-09-03 09:21:44 -04:00
Matthew Haughton
bbf6f4584d Merge pull request #413 from zshahan/enable_streaming
Add flv and mp4 parameters to vhost::location
2014-08-22 13:24:12 -04:00
Matthew Haughton
0adf7f7876 Merge pull request #378 from 3flex/rspec2.99-updates
Convert specs to RSpec 2.99.1 syntax with Transpec
2014-08-22 11:50:49 -04:00
James Fryman
a2dd6cdeae Merge pull request #377 from 3flex/modernize-travis
Improve test suite (Travis updates, librarian-puppet removal, better utilize puppet-lint)
2014-08-22 10:43:50 -05:00
Matthew Haughton
82398b2fd2 Merge pull request #386 from xaque208/whitespace
Align index to the rest of template contents
2014-08-22 11:26:49 -04:00
Matthew Haughton
aea734606f Merge pull request #406 from corycomer/master
Fix deprecated variable access warning
2014-08-22 11:21:30 -04:00
Matthew Haughton
1779d7d68f Merge pull request #410 from jg-development/master
Fixed documentation in resource map

Fixes #405
2014-08-22 11:19:40 -04:00
James Fryman
6a242e036e of course I mess up markdown... 2014-08-22 10:04:42 -05:00
James Fryman
da2ed932bd Merge pull request #420 from jfryman/update-maintainers
Update maintainers in the Repository
2014-08-22 10:03:52 -05:00
James Fryman
e801c31d30 Update maintainers in the Repository
Promoting Matthew Haughton to Repo Collaborator
2014-08-22 10:02:42 -05:00
Matthew Haughton
5251d16914 Merge pull request #412 from 3flex/patch-4
Add Red Hat/CentOS 7 support
2014-08-22 10:58:05 -04:00
zshahan
0c81255724 fix? 2014-08-20 19:53:32 -05:00
Matthew Haughton
88d8984876 Fix remaining lint warnings 2014-08-18 23:04:24 -04:00
Matthew Haughton
51ef4bd00e Fail on lint warnings from now on
Should improve PR quality and eliminate need for PRs to fix
any future lint issues
2014-08-18 22:44:07 -04:00
Matthew Haughton
e80cb6809c Disable noisy/unneeded puppet-lint checks
* disable '80 characters check' - this is pretty useless and noisy
* disable 'class inherits from params class' check - is for puppet 2.6 which isn't supported
2014-08-18 22:43:52 -04:00
Matthew Haughton
bdaba9a86a Add validate and lint tasks to travis script 2014-08-18 22:41:34 -04:00
Matthew Haughton
d7d63a847a Extend Travis test matrix
* Add ruby 2.1.0
* Add back ruby 1.8.7 as allowed failure - shows test results
  but won't mark build as failed
* Enable fast finish - quick feedback on failed builds
* Make test matrix explicit so it's easier to tell what's included
  in the matrix, instead of excluding certain combinations
2014-08-18 22:41:34 -04:00
Matthew Haughton
5aa2f66ca3 Correct errors introduced by using latest apt module
Since librarian-puppet had locked to old versions of Forge modules
but puppetlabs_spec_helper is now pulling the latest version,
there's this incompatibility to take care of in the test suite.
2014-08-18 22:41:34 -04:00
Matthew Haughton
2d4c9d98ac switch to puppetlabs_spec_helper
Removes librarian-puppet since puppetlabs_spec_helper
can now handle installing modules from the Forge.
2014-08-18 22:41:34 -04:00
zshahan
bb61072f2e Merge branch 'enable_streaming' of https://github.com/zshahan/puppet-nginx.git into enable_streaming 2014-08-18 20:39:31 -05:00
zshahan
68a46d3ed1 added streaming options. 2014-08-18 20:34:43 -05:00
zshahan
e219e63875 added streaming options. 2014-08-18 20:07:22 -05:00
Matthew Haughton
c692f1a9b6 Add Red Hat/CentOS 7 support 2014-08-18 14:12:27 -04:00
Jan Gantzert
2e678213ed Fixed documentation in resource map 2014-08-15 23:07:40 +02:00
Cory Comer
3874221ddb Fixing deprecated variable access warning 2014-08-15 04:37:43 -07:00
James Fryman
d0f1f85e8e Merge pull request #396 from chaosmail/master
Added configuration of custom fastcgi_params [fixes #389]
2014-08-13 09:35:12 -05:00
James Fryman
3427ab9160 bump to 0.0.10 2014-08-13 09:09:22 -05:00
Christoph Körner
9bedd7950a Renamed params to fastcgi_param and moved to fastcgi.erb 2014-08-13 12:24:59 +02:00
Christoph Körner
a128713520 Changed description of params in comment block 2014-08-11 10:19:41 +02:00
Christoph Körner
1b7393de4f Removed params in README from example vhost 2014-08-11 10:15:38 +02:00
Christoph Körner
0f507f0d96 Added fastcgi in README for custom fastcgi_params 2014-08-11 10:12:09 +02:00
Christoph Körner
96138715d1 Add support of custom fastcgi_params 2014-08-11 10:04:21 +02:00
James Fryman
e79e91d945 Merge pull request #376 from xaque208/freebsd
Add FreeBSD Support
2014-07-28 16:55:49 -05:00
Zach Leslie
48e53ee10c Set spec group back to original 2014-07-28 14:49:10 -07:00
Zach Leslie
b00614162d Remove logdir selector when everything is the same 2014-07-28 14:49:10 -07:00
Zach Leslie
529fabb866 Update $root_group in manifests to use platform specifics 2014-07-28 14:49:10 -07:00
Zach Leslie
edf9b54fe2 Add specials for FreeBSD and $root_group 2014-07-28 14:49:10 -07:00
Zach Leslie
ce933e4abe Add FreeBSD case for $nx_daemon_user 2014-07-28 14:49:10 -07:00
Zach Leslie
305c439bc6 Fixup for matching $kernelversion on Joyent
This replaces the code that used to exist and now accommodates FreeBSD
using the $kernel fact, but still allows Joyent selection from
$kernelversion.
2014-07-28 14:48:56 -07:00
Zach Leslie
5dda0ad03c Align index to the rest of template contents 2014-07-28 14:12:42 -07:00
Matthew Haughton
7a0d717afe Correct validation of {proxy,fastcgi}_cache_levels
Allow any combination of 1 and 2 in these formats: X, X:X,
and X:X:X, e.g.: "2", "2:2", "1:1:2". The old validation failed if
it wasn't an integer which didn't allow these formats.
2014-07-19 21:00:24 -04:00
Matthew Haughton
32bc360d45 Convert specs to RSpec 2.99.1 syntax with Transpec
This conversion is done by Transpec 2.3.4 with the following command:
    transpec -c "rake spec" spec/classes/ spec/defines/ spec/spec_helper.rb

* 210 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 19 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

* 15 conversions
    from: == expected
      to: eq(expected)

* 15 conversions
    from: obj.should
      to: expect(obj).to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
2014-07-17 22:28:38 -04:00