Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes #1

Merged
merged 122 commits into from
May 19, 2015
Merged

Conversation

SteveMaddison
Copy link

No description provided.

mvintila and others added 30 commits June 24, 2014 19:17
Give example for passenger in README.md and add OpenBSD to the
supported OSs in metadata.json.
This keeps the user from having to duplicate them when defining
nginx::config externally.
Set up relationships for nginx::config even when overridden
README: fix hiera nginx_locations example
The hash sorting was started in #532 and this fixes it for fastcgi as
well.
Sort fastcgi params to have stable ordering
…stemmajrelease

changed $::operatingsystemmajrelease to $::lsbmajdistrelease for Debian
closes #541 (maybe: needs user feedback)
Allow to use OpenBSD specific service_flags and package_flavors.
sort add_header values for vhost
allow listen_ip and ipv6_listen_ip to contain a String or Array
…atingsystemmajrelease

Revert "changed $::operatingsystemmajrelease to $::lsbmajdistrelease for...
Michael Marod and others added 28 commits April 29, 2015 12:24
package/debian: support puppetlabs-apt 2.0.0
…lso passenger_env_var is not set with passenger_set_env_var and this commit undoes that
Add passenger_set_header and passenger_env_var parameters for Passenger 5.0+
travis: test on Puppet 4 for real
Install from upstream by default like for other OSs
remove ensure from concat::fragment as its deprecated
Include ssl settings in rewrite_www server.
The Ruby 1.8.7 tests have been broken for ages, and it's unlikely anyone
will do the work to restore support for the tests. Drop them from the suite
to save Travis CI from doing work for nothing on every commit.
spec: add some more nginx.conf tests
SteveMaddison added a commit that referenced this pull request May 19, 2015
@SteveMaddison SteveMaddison merged commit 58ef496 into sanoma-technology:master May 19, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.