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

Feature/master/passengerbaseuri #1152

Merged

Conversation

aronymous
Copy link
Contributor

(MODULES-2188) Add support for PassengerBaseURI in Apache

@@ -385,6 +386,13 @@
}
}

# Load mod_passenger if needed and not yet loaded
if $passenger_base_uris {
if ! defined(Class['apache::mod::passenger']) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to have this check, include ::apache::mod::passenger will just work.

@underscorgan
Copy link
Contributor

@aronymous thanks for the contribution! This needs a rebase, squash, and tests before this can be merged.

@aronymous
Copy link
Contributor Author

I added tests and made the changes suggested. Hope I did it right. Thanks

@underscorgan
Copy link
Contributor

Hi @aronymous ,

This still needs a squash, there is some pretty good documentation here

This adds a varaible and template block for using PassengerBaseURI in the vhost
@aronymous aronymous force-pushed the feature/master/passengerbaseuri branch from b300a08 to 9367580 Compare September 12, 2015 14:08
@@ -386,6 +387,11 @@
}
}

# Load mod_passenger if needed and not yet loaded
if $passenger_base_uris {
include ::apache::mod::passenger
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 spaces should be 2 space indentation.

underscorgan pushed a commit that referenced this pull request Sep 17, 2015
@underscorgan underscorgan merged commit 346c0e7 into puppetlabs:master Sep 17, 2015
@underscorgan
Copy link
Contributor

Thanks @aronymous

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants