5
0
Ответвление 0
Граф коммитов

1215 коммитов

Автор SHA1 Сообщение Дата
Matthew Haughton
a4cee014be Merge pull request #822 from jfryman/fix-tests
Fix tests
2016-06-22 23:04:34 -04:00
Matthew Haughton
a2164a6467 fix tests that fail on puppet 4.5+ 2016-06-22 23:01:34 -04:00
Matthew Haughton
97f0aca2ba travis: build without system_tests 2016-06-22 23:01:32 -04:00
Matthew Haughton
f451bd3bdb tidy up the gemfile
* Moves beaker dependencies to system_tests group
* pin puppetlabs_spec_helper and rspec-puppet to compatible versions, which should minimize future breakage
* removed explicit dependency on rake
2016-06-22 23:01:24 -04:00
Matthew Haughton
17f3c54dc7 pin puppet-lint to 2.x
Two reasons:
1. Newer is better!
2. Running lint < 2.0 with the current Rakefile will fail - lines longer than 80 chars will cause warnings, and Rakefile says to fail on warnings
2016-06-22 22:11:20 -04:00
Matthew Haughton
ee23449b06 lint:disable 140 char line check
We have some failing tests, and in the Puppet Style Guide it's a SHOULD, not a MUST that lines be under this length
2016-06-22 22:01:33 -04:00
Matthew Haughton
03617d60ec lint: don't lint vendor directory 2016-06-22 21:06:22 -04:00
Matthew Haughton
163556f769 lint: remove disable_80chars config
It was removed in puppet-lint 2.0.0. Leaving it in will fail the build.
2016-06-22 20:44:40 -04:00
Matthew Haughton
ea037f152c Merge pull request #819 from iain-buclaw-sociomantic/emptyline
Fix location template to not add empty line
2016-06-17 10:04:28 -04:00
Matthew Haughton
4f91f7c43c Merge pull request #821 from iain-buclaw-sociomantic/ssltickets
Add ssl_session_tickets and ssl_session_ticket_key parameters
2016-06-17 10:03:59 -04:00
Iain Buclaw
bef7b09f2e
Add ssl_session_tickets and ssl_session_ticket_key parameters 2016-06-17 12:07:33 +02:00
Iain Buclaw
1839b3c755
Fix location template to not add empty line 2016-06-16 17:36:26 +02:00
Matthew Haughton
36952873b9 Merge pull request #811 from frozenfoxx/patch-1
Corrected quickstart documentation
2016-06-02 15:14:24 -04:00
FOXX
87bba358a7 Corrected quickstart documentation
The link for NGINX Documentation had a typo and wasn't rendering correctly.  I also corrected lowercase "puppet" to uppercase "Puppet" where the documentation was describing the project, "Puppet," and not the command, "puppet."
2016-06-02 13:26:21 -05:00
Matthew Haughton
cba946bcb7 Merge pull request #804 from Spechal/master
Resolving issue #803 by adding quotes around the parameters
2016-05-13 12:15:43 -04:00
Travis Crowder
c5fd0a7ace Resolving issue #803 by adding quotes around the parameters 2016-05-09 21:59:52 -05:00
Matthew Haughton
091397c6ae travis: don't test STRICT_VARIABLES
Module actually failed this test, but due to rspec-puppet issues it looked like the tests passed.

Removing this until we actually update to pass with STRICT_VARIABLES
2016-04-12 18:10:35 -04:00
Matthew Haughton
fe0af9e4e6 Merge pull request #788 from hbog/proxy_cache_valid
Add support for multiple 'proxy_cache_valid' directives
2016-04-12 18:09:21 -04:00
Matthew Haughton
b4946b7574 Merge pull request #798 from rchicoli/ssl_verify_client
add ssl_verify_client parameter
2016-04-12 18:08:26 -04:00
Rafael Chicoli
e43d8dca86 add ssl_verify_client parameter 2016-04-12 14:14:01 +02:00
Herwig Bogaert
e62342e779 new proxy_cache_valid parameter validation 2016-04-12 10:03:08 +02:00
James Fryman
f13fdc02a0 Merge pull request #747 from Ensighten/add_events_accept_mutex_delay
Add events accept mutex delay
2016-04-04 12:54:37 -05:00
herwig Bogaert
40d157482e Allow multiple 'proxy_cache_valid' directives 2016-03-25 11:28:26 +00:00
Matthew Haughton
56e1c591bf Merge pull request #778 from vicinus/master
bugfix: convert integer strings to integer
2016-03-07 10:18:55 -05:00
Vicinus, Reinhard
f8ced072d9 bugfix: convert integer strings to integer
with puppet 4 the following is no longer true: 1 == '1'. So with puppet 4 it
must be ensured, that when variables are compared either both are integer or
both are strings.
2016-03-06 10:18:12 +01:00
James Fryman
b92a31947b Merge pull request #775 from ghoneycutt/remove_SSLv3
Remove SSLv3 as it is insecure
2016-03-02 11:40:39 -06:00
Garrett Honeycutt
cb7ca304f2 Remove SSLv3 as it is insecure 2016-03-02 13:06:46 +01:00
Matthew Haughton
d3826d74d8 Merge pull request #772 from bernhardjt/feature_satisfy
Add "satisfy" option to the location section
2016-02-25 16:39:09 -05:00
Bernhard Thüsch
2154002e73 Add "satisfy" option to the location section
https://www.nginx.com/resources/admin-guide/restricting-access/
http://nginx.org/en/docs/http/ngx_http_core_module.html?&_ga=1.238118336.1949645469.1456390584#satisfy
2016-02-25 18:30:21 +01:00
Matthew Haughton
38fd1950fb Merge pull request #770 from kisst/master
update catch all vhost example doc
2016-02-24 09:42:36 -05:00
kisst
ff6c2b341d update catch all vhost example doc 2016-02-24 14:33:01 +00:00
Matthew Haughton
9b673763bb Merge pull request #768 from mlipiec/master
Fixing ruby <-> puppet misconfiguration - warning() should be used in…
2016-02-22 09:58:26 -05:00
Marcin Lipiec
9e0e51c27c Fixing ruby <-> puppet misconfiguration - warning() should be used instead of warn(). 2016-02-22 14:56:59 +01:00
Matthew Haughton
a674c8d5ce Merge pull request #765 from jfryman/3flex/fix-748
Allow removal of gzip_types from the config
2016-02-15 10:06:05 -05:00
Matthew Haughton
1d4fb7ad07 config: gzip_types undef by default
No change to server behaviour. Fixes #748
2016-02-08 16:26:32 -05:00
Matthew Haughton
fc905b0d7a nginx.conf: remove gzip_types when undef 2016-02-08 16:25:25 -05:00
James Fryman
6689f3025d Merge pull request #757 from brandonweeks/concat2.x
Supress warnings with concat 2.x
2016-02-08 15:03:12 -06:00
James Fryman
b58a3f4e0c updating to v0.3.0 2016-02-06 14:37:12 -06:00
Matthew Haughton
332d4e5665 Merge pull request #762 from alexharv074/Issue_758
nginx version fact compatibility with Facter 1.7
2016-02-06 01:18:51 -05:00
Matthew Haughton
b8f2cfaeb6 Merge pull request #764 from jfryman/3flex/travis-bundler-caching
travis: enable bundler caching in builds
2016-02-05 12:55:16 -05:00
Matthew Haughton
cf460496df Merge pull request #763 from jfryman/3flex/enable-strict-variables
travis: test with strict_variables on puppet 4
2016-02-05 12:55:08 -05:00
Matthew Haughton
72499fb193 travis: enable bundler caching in builds
From https://docs.travis-ci.com/user/caching:

On Ruby and Objective-C projects, installing dependencies via Bundler
can make up a large portion of the build duration. Caching the bundle
between builds drastically reduces the time a build takes to run.
2016-02-05 12:35:21 -05:00
Matthew Haughton
581d08c963 travis: test with strict_variables on puppet 4 2016-02-05 12:33:32 -05:00
Matthew Haughton
ed6d35e4a8 Merge pull request #761 from ericsysmin/patch-2
removed invalid resource parameters from doc
2016-02-05 11:49:34 -05:00
Alex Harvey
a6c5782011 nginx version fact compatibility with Facter 1.7 2016-02-05 18:11:15 +11:00
Eric Anderson
613ef01775 removed invalid resource parameters from doc 2016-02-04 16:16:27 -08:00
Matthew Haughton
955c685395 Merge pull request #750 from alexharv074/Issue_749
Issue_749  Add 'managed by puppet' to config files
2016-02-03 11:32:47 -05:00
Alex Harvey
d2839c723c Issue_749 Add 'managed by puppet' to config files 2016-02-03 14:35:18 +11:00
Brandon Weeks
e40ce7cea6 Supress warnings with concat 2.x 2016-02-02 17:40:42 -08:00
Matthew Haughton
3e71867960 Merge pull request #756 from xa4a/patch-2
Fix a typo in location_custom_cfg_append description.
2016-02-02 12:47:58 -05:00