-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Preserve /etc/httpd/conf.d/passenger.conf on EL7
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)
- Loading branch information
Dominic Cleal
committed
Jan 28, 2016
1 parent
ce48f57
commit ecc2909
Showing
2 changed files
with
40 additions
and
25 deletions.
There are no files selected for viewing
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
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
ecc2909
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just got caught out with this one, not sure why passenger is special, why does it's configuration file
from the package get preserved. That is not the case with other module is it?
Steve
ecc2909
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@traylenator because the PassengerRoot directive is normally in this config file, and the value varies so much between packages and operating systems I figured in 005bf61 that it was worth preserving the packaged value.
It would be a lot of effort to keep the value in this module accurate, and more work for the user to have to specify the value (though I think that's perhaps the more correct approach).
ecc2909
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here is the default loading sequence of the conf files
Include "/etc/httpd/conf.modules.d/.load"
Include "/etc/httpd/conf.modules.d/.conf"
Include "/etc/httpd/conf/ports.conf"
IncludeOptional "/etc/httpd/conf.d/*.conf"
According to this, the conf.d/passenger.conf from el7 package will overwrite any apache::mod::passenger settings like passengerruby