Commit graph

1239 commits

Author SHA1 Message Date
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
Ievgen Varavva
ac0ccdfded Fix a typo in location_custom_cfg_append description. 2016-02-02 16:29:00 +00:00
Matthew Haughton
f544dfec0a Merge pull request #753 from jyaworski/add_nginx_version_fact
Add nginx_version fact
2016-02-01 11:44:37 -05:00
Joseph Yaworski
1729f45b65 Add nginx_version fact 2016-01-29 12:44:16 -05:00
James Fryman
adbb76a985 Merge pull request #752 from alexharv074/Issue_751
Issue 751 Add an example for a simple reverse proxy to the README
2016-01-28 06:57:43 -06:00
Alex Harvey
719832cb28 Issue_751 Add simple reverse proxy example to README 2016-01-28 14:17:49 +11:00
Matthew Robinson
83ab19cdb9 Add spec tests 2016-01-25 19:50:19 -08:00
Matthew Robinson
75422ccf78 Add support for managing events.accept_mutex settings 2016-01-25 19:41:06 -08:00
James Fryman
0e3cddcd8d Merge pull request #738 from jkroepke/hiera_locations
Added locations paramater to use it in hiera.
2016-01-20 16:38:43 -06:00
James Fryman
d05723c7b7 Merge pull request #744 from gerases/master
Remove extra white space
2016-01-20 15:35:21 -06:00
gerases
83043627f5 Remove extra white space 2016-01-20 15:29:17 -06:00
Jan
2db55e9bd0 Added locations paramater to use it in hiera. 2016-01-17 15:48:38 +01:00
James Fryman
c2571e563f Merge pull request #725 from pallavjosh/master
restart replaced with reload in service_spec.rb file
2015-12-08 09:44:45 -06:00
pjoshi
955cdc7aac typo corrected 2015-12-04 09:17:48 +05:30
pjoshi
2be9096e34 removed configtest command 2015-12-03 18:37:58 +05:30
pjoshi
914f92a49a restart relaced with reload in service_spec.rb file 2015-12-03 13:56:07 +05:30
James Fryman
72e7c579ca Merge pull request #724 from vicinus/master
improved location ordering
2015-11-30 07:35:12 -06:00
James Fryman
0e930e9ed3 Merge pull request #637 from jacobmw/proxy_cache_path
Multiple proxy_cache_path entries
2015-11-30 07:32:05 -06:00
Vicinus, Reinhard
15dfc77709 improved location ordering 2015-11-30 12:19:20 +01:00
Matthew Haughton
c728f8ce1f Merge pull request #715 from 3flex/694-deprecate-proxy_conf_template
Deprecate $proxy_conf_template
2015-11-05 13:22:36 -05:00
Matthew Haughton
d034b302f2 Deprecate $proxy_conf_template
This parameter has no effect as of #642
2015-11-05 11:13:50 -05:00
Matthew Haughton
0c7973b20c Merge pull request #705 from kwolf/master
Ensure isn't being respected on locations.
2015-11-05 10:52:12 -05:00
James Fryman
cae1e8f17a Merge pull request #700 from alphagov/default_proxy_headers
Update vhost proxy_set_header defaults to match location
2015-11-02 13:39:44 -06:00
James Fryman
36a64b0e31 Merge pull request #702 from matfra/master
Replaced restart by reload
2015-11-02 13:39:20 -06:00
James Fryman
f54a88975a Merge pull request #707 from werekraken/unix_socket
Add unix socket for listening.
2015-11-02 13:38:26 -06:00
James Fryman
98e284406d Merge pull request #709 from Phil-Friderici/severity_level
Add parameter to allow setting error_log severity level
2015-11-02 13:36:59 -06:00
Phil Friderici
c849c2cb7d Add parameter to allow setting error_log severity level 2015-11-01 13:14:08 +00:00