This commit has git merge tags, it's broken

Revert "Merge branch 'disable-yum-repo-management' of github.com:rytis/puppet-nginx into rytis-disable-yum-repo-management"

This reverts commit 7ea6b570c3ff550f145ef98af66169bfb6500e78, reversing
changes made to c314aa6e36879ded86420012c34b17320e250f71.
Broken upstream, merge tags in init.pp

Revert "Merge pull request #145 from deric/master"

This reverts commit c314aa6e36879ded86420012c34b17320e250f71, reversing
changes made to 315d7e109fc172ce792f411074e1edfee1f6ba2e.
Merged latest to support multiple proxy parameters

Merge branch 'master' of https://github.com/jfryman/puppet-nginx

Conflicts:
	manifests/init.pp
	manifests/package.pp
	manifests/package/debian.pp
	manifests/package/redhat.pp
Fix package.pp parameters
Handle old versions of nginx for redirect
Fix http to https redirect for nginx < 0.8.42

Return codes with redirect URL were not supported
prior to 0.8.42, if the version is lower we use a
rewrite rule instead.
Move ssl server listen parameter to EOL

Older versions of nginx require the default parameter to
precede the ssl parameter.
Default ssl protocols are now set by nginx version

nginx did not support TLS1.1/1.2 prior to version
1.0.12, default ssl protocols should reflect this.
Fix indentation of proxy.conf parameters
Fixe http_proxy_version
Fix syntax errors in new patches
Fix syntax
Use facter to get nginx version and set ssl parms
Change nginx version detection method
Better handling of nginx version fact
Add ruby/rubygems dep
Remove dep on rubygems using puppet instead

Use puppet to do version comparison instead of ruby gems
Add required install of dep packages
Fix variable access to modern format
Merge branch 'master' of github.com:jalli/puppet-nginx

Conflicts:
	Puppetfile
	Puppetfile.lock
	manifests/package/redhat.pp
	manifests/resource/vhost.pp
	templates/vhost/vhost_ssl_header.erb