Preserve /etc/httpd/conf.d/passenger.conf on EL7 #1345
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mod_passenger provides a passenger.conf containing PassengerRoot to ensure the service starts up correctly. On EL7, this is installed at /etc/httpd/conf.d/passenger.conf and has been protected from purging since 005bf61. The change in 2a60859 to move LoadModule config files to /etc/httpd/conf.modules.d/ on EL7 also affected the path of the protected passenger.conf. This change reverts the path change to match the packages. In summary, prior to 2a60859 (release 1.7.0): - /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged) - /etc/httpd/conf.d/passenger_extra.conf with apache::mod::passenger settings - /etc/httpd/conf.d/zpassenger.load with LoadModule In 2a60859 (release 1.8.0): - /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings - /etc/httpd/conf.modules.d/zpassenger.load with LoadModule - /etc/httpd/conf.d/passenger.conf is purged With this commit: - /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings - /etc/httpd/conf.modules.d/zpassenger.load with LoadModule - /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged)
bmjen
added a commit
that referenced
this pull request
Jan 28, 2016
Preserve /etc/httpd/conf.d/passenger.conf on EL7
|
@bmjen : Any chance, that this commit gets into master as well? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
mod_passenger provides a passenger.conf containing PassengerRoot to
ensure the service starts up correctly. On EL7, this is installed at
/etc/httpd/conf.d/passenger.conf and has been protected from purging
since 005bf61.
The change in 2a60859 to move LoadModule config files to
/etc/httpd/conf.modules.d/ on EL7 also affected the path of the
protected passenger.conf. This change reverts the path change to match
the packages.
In summary, prior to 2a60859 (release 1.7.0):
In 2a60859 (release 1.8.0):
With this commit:
I targeted this at the 1.8.x branch, as it's a regression in 1.8.0 - is that OK? I assume it'll get merged up to master and possibly put into a patch release this way.