Reintegrate jfryman/puppet-nginx#331 (upstream exports/collections)
- resurrecting jfryman/puppet-nginx#331 from @rainopik
- update (concat/stdlib) dependency version requirements based on current usage
- fix upstream tests to work with rainopik's changes in what was jfryman/puppet-nginx#331
allow override of proxy_redirect = off
refactor locations to remove a bit of redundancy
Puppet-lint fix. Enclosing variable
Add client_body_temp_path and proxy_temp_path to proxy.conf.
Added tests for
pid
http_tcp_nodelay
http_tcp_nopush
keepalive_timeout
$ssl is implied by $ssl_only
(I'm too lazy to add ssl=true AND ssl_only=true to each location)
$ssl is implied by $ssl_only
(I'm too lazy to add ssl=true AND ssl_only=true to each location)
Merge pull request #352 from rabbitt/refactor-location

refactor locations to remove a bit of redundancy
Merge pull request #357 from nalbion/feature/ssl_implied_by_ssl_only

$ssl implied by $ssl_only
Merge pull request #355 from janorn/rspec_test

Add more spec tests
Merge pull request #354 from janorn/temp_paths

Add client_body_temp_path and proxy_temp_path to proxy.conf.
Merge pull request #353 from hundredacres/master

Puppet-lint fix. Enclosing variable
Merge pull request #350 from eholzbach/master

allow override of proxy_redirect = off
Merge pull request #347 from rabbitt/feature/upstream-exports

Reintegrate jfryman/puppet-nginx#331 (upstream exports/collections)
add ability to designate location as internal
Merge pull request #351 from rabbitt/feature/internal-locations

add ability to designate location as internal
Merge remote-tracking branch 'jfryman/master' into feature/template_formatting

Conflicts:
	templates/conf.d/proxy.conf.erb
	templates/conf.d/upstream_header.erb
	templates/vhost/vhost_location_directory.erb
	templates/vhost/vhost_location_empty.erb
	templates/vhost/vhost_location_proxy.erb