Update server.xml for 6.5.x (since like 5.4.0 actually)

[TJM]

Here are some updates, per https://www.jfrog.com/confluence/display/RTF/Upgrading+Artifactory

• Added startStopThreads="2" (since 5.4.0)
• Added sendReasonPhrase="true" to all connectors (since 5.6.1)
• Added connector for port 8040, access listener (since 5.7.0)
• Added relaxedPathChars='[]' relaxedQueryChars='[]' (since 6.3.0)

I am not sure why AJP is commented out, but I left it that way, and just added the new options, in case someone needs to enable it.

Also, I am not sure why the shutdown port is disabled, since the "stop" process tries to use it.

Interestingly, the "PRO" version questions whether this is needed. Is it still needed?

~tommy

[jainishshah17]

LGTM

[jainishshah17]

@TJM I think we should make the custom server.xml optional

[TJM]

Sorry, I think this branch got mixed up with my "all fixes to make it work" ... it was supposed to be just the server.xml fixes. :)

@jainishshah17 I wondered if the custom server.xml was actually needed. I think it mostly has to do with changing the application port to match what was assigned through docker? right?

[TJM]

This section concerns me. I don't really feel like pre-populating the same keys in everyone's HA artifactory is a good idea.

[jainishshah17]

@TJM We don't need this anymore

[TJM]

I will remove them.

[jainishshah17]

@TJM Yes, server.xml was only used to change default port to dynamically assigned port

[TJM]

@jainishshah17 The server.xml also has some other stuff:

        <Engine name="Catalina" defaultHost="localhost">
            <Host name="localhost" appBase="webapps" startStopThreads="2"/>
        </Engine>

vs

        <Engine name="Catalina" defaultHost="localhost">
            <Host name="localhost" appBase="webapps" startStopThreads="2"/>
            <Valve className="org.apache.catalina.valves.RemoteIpValve"
                   remoteIpHeader="x-forwarded-for"
                   protocolHeader="x-forwarded-proto"
                   portHeader="x-forwarded-port" />
        </Engine>

Are these still needed (desired)?

[TJM]

Re key... https://www.jfrog.com/confluence/display/RTF/HA+Installation+and+Setup#HAInstallationandSetup-CreatetheMasterKey

Maybe it would be better to "generate" the key in the entrypoint script and put it in shared storage?

[TJM]

What is the status of this? Do I need to do anything else (besides bumping the versions?)

[elioengcomp]

LGTM :)