Skip to content

Commit 87cedef

Browse files
NETWORKING:Def CName in Http Publish Addr to True (#33631)
* Follow up to #32806 setting the setting to true for 7.x
1 parent 1391288 commit 87cedef

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -828,9 +828,6 @@ class BuildPlugin implements Plugin<Project> {
828828
// TODO: remove this once ctx isn't added to update script params in 7.0
829829
systemProperty 'es.scripting.update.ctx_in_params', 'false'
830830

831-
//TODO: remove this once the cname is prepended to the address by default in 7.0
832-
systemProperty 'es.http.cname_in_publish_address', 'true'
833-
834831
// Set the system keystore/truststore password if we're running tests in a FIPS-140 JVM
835832
if (project.inFipsJvm) {
836833
systemProperty 'javax.net.ssl.trustStorePassword', 'password'

docs/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ integTestCluster {
5656

5757
// TODO: remove this for 7.0, this exists to allow the doc examples in 6.x to continue using the defaults
5858
systemProperty 'es.scripting.update.ctx_in_params', 'false'
59-
//TODO: remove this once the cname is prepended to the address by default in 7.0
60-
systemProperty 'es.http.cname_in_publish_address', 'true'
6159
}
6260

6361
// remove when https://github.com/elastic/elasticsearch/issues/31305 is fixed

modules/lang-painless/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ esplugin {
2525
integTestCluster {
2626
module project.project(':modules:mapper-extras')
2727
systemProperty 'es.scripting.update.ctx_in_params', 'false'
28-
systemProperty 'es.http.cname_in_publish_address', 'true'
2928
}
3029

3130
dependencies {

server/src/main/java/org/elasticsearch/http/HttpInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class HttpInfo implements Writeable, ToXContentFragment {
4141

4242
/** Whether to add hostname to publish host field when serializing. */
4343
private static final boolean CNAME_IN_PUBLISH_HOST =
44-
parseBoolean(System.getProperty("es.http.cname_in_publish_address"), false);
44+
parseBoolean(System.getProperty("es.http.cname_in_publish_address"), true);
4545

4646
private final BoundTransportAddress address;
4747
private final long maxContentLength;

0 commit comments

Comments
 (0)