Use zpassenger.load for passenger #1132
Closed
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
xprazak2
force-pushed
the
zpass
branch
4 times, most recently
from
e0767ab to
9254b5b
Compare
xprazak2
changed the title
| touch -r %{SOURCE10} passenger.conf | ||
| install -pm 0644 passenger.conf %{buildroot}%{_httpd_confdir}/passenger.conf | ||
|
|
||
| touch -r %{SOURCE12} zpassenger.load | ||
| install -pm 0644 zpassenger.load %{buildroot}%{_httpd_modconfdir}/zpassenger.load |
There was a problem hiding this comment.
Why install an empty file here, shouldn't it be the SOURCE12?
theforeman-bot
added
Needs testing
Needs re-review
and removed
Waiting on contributor
labels
|
It definitely should be SOURCE12, it is not empty now. |
| touch -r %{SOURCE10} passenger.conf | ||
| install -pm 0644 passenger.conf %{buildroot}%{_httpd_confdir}/passenger.conf | ||
|
|
||
| touch -r %{SOURCE12} zpassenger.load | ||
| cat %{SOURCE12} > zpassenger.load |
There was a problem hiding this comment.
just install %{SOURCE12} below, I don't see why this extra copy's needed?
xprazak2
force-pushed
the
zpass
branch
4 times, most recently
from
6f8f017 to
2691389
Compare
|
I finally got a green build on Jenkins, could you pls take another look @domcleal ? |
|
EL6 is no longer supported, this PR's not applicable. mod_passenger should be provided by EPEL in any case nowadays, not Foreman. |
|
Thanks @domcleal, closing. |
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.
This is another attempt to fix #14687. I do not think any changes regarding this problem will be accepted into puppetlabs-apache, since the module works as intended. The issue is rather a result of interaction between said module and our package.
puppetlabs-apache introduced
zpassenger.loadfile that loads passenger module with lower priority as described here. Since we want our package to work when not managed by puppet, I moved the loading of a module frompassenger.conftozpassenger.load. This should remove the duplicated loading when managed by puppet and will work on its own as well.