Commit graph

1247 commits

Author SHA1 Message Date
Matthew Haughton
7b3412f46c Merge pull request #852 from Faffnir/master
Merge Request #851 introduced a wrong order of installation
2016-08-12 09:13:27 -04:00
David Leib
739b7bfb8d Merge Request #851 introduced a wrong order of installation 2016-08-12 14:37:28 +02:00
Matthew Haughton
2b566d04c9 Merge pull request #851 from Barzahlen/master
Conditionally adding the packages if they are not added previously
2016-08-11 11:32:27 -04:00
David Leib
8bd354a0db Conditionally adding the packages if they are not added previously
Replaced the not defined statements with a more practical ensure_packages and removed the not defined from passenger becase it should be defined only once
2016-08-11 16:46:45 +02:00
Matthew Haughton
127bdabf5f Merge pull request #841 from Slm0n87/proxy_use_temp_path
Add use_temp_path into proxy_cache_path
2016-07-29 08:58:28 -04:00
Matthew Haughton
1a1288b204 Merge pull request #842 from jfryman/fix-tests-ruby19
gemfile: pin json_pure to 2.0.1 or lower on ruby 1.x
2016-07-29 08:57:06 -04:00
Matthew Haughton
ea4e2cdd17 gemfile: pin json_pure to 2.0.1 or lower on ruby 1.x
json_pure 2.0.2 requires ruby 2.0 or higher
2016-07-29 08:48:16 -04:00
Simon Stier
5a4f6069f9 Add use_temp_path into proxy_cache_path
see http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cache_path
2016-07-28 17:17:55 +02:00
Matthew Haughton
63f26298f1 Merge pull request #838 from ryno75/master
fixing issue #837
2016-07-25 12:02:16 -04:00
Ryan Kennedy
ddc52d1813 fixing issue #837 2016-07-23 17:13:05 -07:00
James Fryman
fca0c6c150 Merge pull request #835 from vshn/httpoxy
Mitigating Httpoxy
2016-07-22 15:14:36 +00:00
Matthew Haughton
b17020dca8 test httpoxy workaround 2016-07-22 10:14:37 +02:00
Marco Fretz
64c7b2c03c unset Proxy header in proxy config 2016-07-22 09:55:03 +02:00
Marco Fretz
3404c4c651 unset HTTP_PROXY header 2016-07-22 09:17:41 +02:00
Matthew Haughton
e54f4dcaa2 Merge pull request #832 from sorreltree/remove_storeconfigs_warning_on_puppet_apply
Remove storeconfigs warning on puppet apply
2016-07-20 15:08:15 -04:00
Michael Bacon
03b4ac5ea3 Separate upstream member collection into separate module to kill storeconfig warn 2016-07-15 12:12:47 -04:00
Matthew Haughton
265f864096 Merge pull request #826 from jfryman/metadata-boost
Enhance module metadata
2016-06-23 23:33:38 -04:00
Matthew Haughton
caeffeb2e8 add enable metadata-json-lint gem 2016-06-23 23:30:25 -04:00
Matthew Haughton
45772f18d8 metadata: claim support for puppet 4, AIX, FreeBSD & NetBSD 2016-06-23 23:27:54 -04:00
Matthew Haughton
2e33abed01 Merge pull request #825 from jfryman/test-for-813
add test for #813
2016-06-23 23:13:51 -04:00
Matthew Haughton
9002d86437 add test for #813 2016-06-23 23:07:48 -04:00
Matthew Haughton
204512fa86 Merge pull request #813 from bastelfreak/fixfact
make fact work on old nginx as well
2016-06-23 22:59:31 -04:00
Matthew Haughton
334b609b89 Merge pull request #824 from jfryman/travis-updates
travis: enhance the configuration
2016-06-23 22:55:46 -04:00
Matthew Haughton
03bc588f9d travis: enhance the configuration
* Test Puppet 3.0 on Ruby 1.9.3, everything else on latest Ruby 2.1.10
* Test Puppet 3.0 on future parser again
* Test with strict variables, but don't fail the build if it fails (yet!)
2016-06-23 22:53:31 -04:00
Matthew Haughton
9f085500b2 Merge pull request #815 from ekingme/patch-1
Confine nginx_version fact
2016-06-23 14:16:12 -04:00
Greg Koch
b6c6df1f61 update nginx_version fact to check for kernel not equal windows 2016-06-23 14:13:59 -04:00
Matthew Haughton
8eb657f2ea Merge pull request #805 from samuelson/proxy_hide_header
Support for proxy_hide_header directive.
2016-06-23 13:48:27 -04:00
Matthew Haughton
ef61c5aa8f readme: travis badge should show master branch status
Right now it's showing status of most recent build, which can be misleading.
2016-06-23 09:41:57 -04:00
Matthew Haughton
80c13af396 Merge pull request #817 from iain-buclaw-sociomantic/manageservice
Add manage_service parameter
2016-06-23 09:37:18 -04:00
Iain Buclaw
446a3e9dcf
Add service_manage parameter 2016-06-23 15:28:17 +02:00
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
Tim Meusel
189cf0725c
make fact work on old nginx as well
CentOS 7 (default fact works): nginx version: nginx/1.10.0
CentOS 6: nginx: nginx version: nginx/1.0.0
2016-06-08 12:01:17 +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
Josh Samuelson
12dfb7e98d Support for proxy_hide_header directive.
I need this to hide X-Frame-Options for a single location block.

From nginx docs:
By default, nginx does not pass the header fields “Date”, “Server”,
“X-Pad”, and “X-Accel-...” from the response of a proxied server to a
client. The proxy_hide_header directive sets additional fields that will
not be passed.
2016-05-12 09:09:16 -07: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