Fixes #11647: Upgrade to Jetty9 #1397
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
peckpeck
reviewed
Oct 23, 2017
| @@ -141,12 +141,12 @@ mkdir -p %{buildroot}/var/rudder/run | |||
|
|
|||
| cd %{_topdir}/SOURCES | |||
|
|
|||
| cp -a jetty7 %{buildroot}/opt/rudder | |||
| cp -a jetty %{buildroot}/opt/rudder | |||
There was a problem hiding this comment.
You should also copy jetty-base files here
|
PR rebased |
fanf
force-pushed
the
arch_11647/upgrade_to_jetty9
branch
from
abeff2a
to
3730745
Compare
|
OK, merging this PR |
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.
https://www.rudder-project.org/redmine/issues/11647
Nice novelty: in Jetty9, we have a $JETTY_BASE where you define your modules (new concept, very cleanly defined!) and webapp env config. $JETTY_HOME is kept only for the base distrib and is not modifed (which should ease future upgrade). Doc is here http://www.eclipse.org/jetty/documentation/current/startup-base-and-home.html, and it is nice! The one for module is here, about how to list/search/add modules: http://www.eclipse.org/jetty/documentation/current/startup-modules.html.
All patches pass with minor changes. I'm not sure we need to keep the one about setuid, because there is a module which seem to do just that.
I choose to define JETTY_BASE=/opt/rudder/etc/rudder-jetty-base (so along /opt/rudder/etc/rudder-jetty.config file). /opt/rudder/share/webapp does not change.