Commit graph

718 commits

Author SHA1 Message Date
Markus Rekkenbeil
971e1a7692 Update vhost_location documentation and template 2014-02-10 18:14:18 +01:00
James Fryman
d2f7f1403d Merge pull request #254 from cdenneen/master
Added vhost ssl prepend and append
2014-02-10 09:45:09 -06:00
James Fryman
a2abc95723 Merge pull request #252 from createdbypete/deprecation-notice
Fix nginx::params deprecation notice
2014-02-10 09:43:28 -06:00
Chris Denneen
7a83b0ebf2 Merge remote-tracking branch 'origin/patch-1'
* origin/patch-1:
  Update vhost_ssl_header.erb
2014-02-07 18:43:41 -05:00
cdenneen
408b0c8b12 Update vhost.pp 2014-02-07 18:40:52 -05:00
cdenneen
41ebc1a659 Update vhost_ssl_footer.erb 2014-02-07 18:37:32 -05:00
cdenneen
4f8c71a5b6 Update vhost_ssl_header.erb
Add vhost_cfg_prepend to vhost_ssl_header
Add vhost_cfg_ssl_prepend to vhost_ssl_header
2014-02-07 18:36:30 -05:00
Tristan Helmich
05386c2b74 Allow location_{allow,deny} to be used for proxy locations 2014-02-07 13:44:23 +01:00
Peter Rhoades
4b807acbef Checks $caller_module_name is defined
[See #240]
2014-02-06 22:21:19 +00:00
James Fryman
26a856e338 Merge pull request #248 from PierreR/patch-1
Avoid creating undef variable
2014-02-06 08:59:19 -06:00
James Fryman
de428893f2 Merge pull request #249 from fadenb/bug/duplicate_listen_option_ipv6only
Bugfix for duplicate listen option caused by hardcoded `ipv6only=on` in template
2014-02-04 06:20:57 -08:00
James Fryman
e423db2821 Merge pull request #250 from fadenb/bug/fix_upstream_fail_timeout_spec
Update test to reflect modified template from #171
2014-02-04 06:19:28 -08:00
Tristan Helmich
c78ebbfcd2 Update test to reflect modified template from #171 2014-02-03 14:36:06 +01:00
Tristan Helmich
4fb4129aa4 Update tests accroding to changed templates
Specs no longer require `ipv6only=on` in listen option when using user
supplied value since it is no longer hardcoded in the template.
2014-02-03 13:13:06 +01:00
Tristan Helmich
15a2695442 Move ipv6only=on option from template into puppet
See jfryman#30
2014-02-03 12:54:44 +01:00
Pi3r
27a6fd7532 Avoid creating undef variable 2014-02-01 19:33:49 +01:00
Jan Örnstedt
4a0a857a38 Added basic support for nginx on Solaris. 2014-01-30 16:41:44 +01:00
James Fryman
eeb0830b7f Merge pull request #246 from inflection/add_client_max_body_size
Adding client_max_body_size.
2014-01-28 13:08:28 -08:00
James Fryman
8b29715179 Merge pull request #171 from thomasbiddle/upstream_fail_timeout
Adding upstream fail_timeout.
2014-01-28 12:57:14 -08:00
TJ Biddle
52b124e505 Adding client_max_body_size. 2014-01-28 12:52:56 -08:00
James Fryman
9b357bcad4 Merge pull request #243 from huandu/master
Sort @passenger_cgi_param to make sure generated config file content is stable.
2014-01-24 09:07:24 -08:00
Huan Du
542cbbef2c use stable sort to ensure passenger_set_cgi_param key sequence stable. 2014-01-24 20:25:12 +08:00
James Fryman
d1dc560a37 Merge pull request #233 from abraham1901/dev
Fixed long names virtual hosts...
2014-01-23 13:47:04 -08:00
Lebedev Vadim
6997df9d5a Merge branch 'dev' of https://github.com/abraham1901/puppetlabs-nginx into dev 2014-01-21 15:23:06 +04:00
Lebedev Vadim
2252d96fe8 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-21 15:22:19 +04:00
Vadim Lebedev
520b8fe9b4 Merge pull request #1 from 3flex/rspec-tests
test vhost name is sanitized
2014-01-18 12:25:48 -08:00
Matthew Haughton
325ae7e6de test vhost name is sanitized 2014-01-18 13:31:05 -05:00
James Fryman
6f56cd206e Merge pull request #239 from oxilion/gzip
Make gzip configurable
2014-01-17 16:28:49 -08:00
Lebedev Vadim
26cf99c8e4 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-17 20:08:56 +04:00
Lebedev Vadim
d340eea512 remove sort array in location_custom_cfg_* 2014-01-17 20:08:01 +04:00
Lebedev Vadim
22b3f5a8c6 fix README 2014-01-17 16:49:28 +04:00
Maurits Landewers
e36aa73b6e Make gzip configurable 2014-01-17 10:29:56 +01:00
Matthew Haughton
f395484ab5 remove changelog
It hasn't been maintained, so better to remove it for now.
2014-01-16 13:09:53 -05:00
James Fryman
eb7776fc7f Merge pull request #237 from 3flex/patch-1
workaround missing librarian-puppet-maestrodev dependencies
2014-01-16 08:54:57 -08:00
Matthew Haughton
b790d96446 workaround missing librarian-puppet dependencies
librarian-puppet-maestrodev gem specifies Ruby 1.8 dependencies incorrectly. open3_backport and json are required on Ruby 1.8
but are not currently installed. See
https://github.com/maestrodev/librarian-puppet/issues/16
2014-01-16 11:39:08 -05:00
James Fryman
32539e80a0 Merge pull request #236 from php-coder/patch-1
manifests/conf.pp: fixed a typo in error message.
2014-01-14 11:25:08 -08:00
Lebedev Vadim
f4d543e0e9 update tests 2014-01-14 22:07:17 +04:00
Lebedev Vadim
a4ddf886b2 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-14 19:57:45 +04:00
Lebedev Vadim
088f1414c9 revert change priority type 2014-01-14 19:57:13 +04:00
Slava Semushin
643e803298 manifests/conf.pp: fixed a typo in error message. 2014-01-14 14:46:26 +03:00
James Fryman
42c290d87b Merge pull request #235 from 3flex/location-rewrite-rules
added rewrite to location/proxy & vhost
2014-01-13 11:05:16 -08:00
Matthew Haughton
dc3817f9ae added rewrite to location/proxy & vhost
With credit to https://github.com/OmarzT
2014-01-13 13:20:02 -05:00
Lebedev Vadim
e94af129e4 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': }
Add example nginx::vhost with HTTPS FastCGI and redirection of HTTP
Add location_custom_cfg_prepend & location_custom_cfg_append. Used for logical structures such as if.
Fix puppet-lint
2014-01-12 23:15:14 +04:00
James Fryman
74a8ed1e87 Merge pull request #231 from CpuID/master
(Revised Commit) Support for server_names_hash_bucket_size and server_names_hash_max_size
2014-01-10 09:27:27 -08:00
Nathan Sullivan
70256dcb2a improved version of support for server_names_hash_bucket_size and server_names_hash_max_size for https://github.com/jfryman/puppet-nginx/pull/178 - also a few puppet-lint fixes 2014-01-10 13:42:16 +10:00
James Fryman
fa6be86dc2 Merge pull request #230 from 3flex/README-updates
README updates
2014-01-09 13:39:18 -08:00
Matthew Haughton
dd7df92ea2 cleanup README
* Make a hypothetical puppet-lint run happy
* Remove redundant parameters from resource declarations (e.g. 'ensure')
* Unquote a boolean which would fail with the recently added validations
* Simplify Puppet w/ Passenger example by removing SSL cipher/cache settings
* Add syntax highlighting where it was missing
* Provide complete vhost example for "Nginx with precompiled Passenger"
2014-01-09 16:37:47 -05:00
Matthew Haughton
12ecdadc35 add SSL configuration instructions to README 2014-01-09 16:33:44 -05:00
James Fryman
cd06f3593e Merge pull request #226 from huandu/master
Fix a config error in the last sample in README
2014-01-08 08:40:51 -08:00
James Fryman
7086aea8c0 Merge pull request #228 from PierreR/patch-1
Fix multi-line comment indentation
2014-01-08 08:40:25 -08:00