diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties index fd9e7964fe..00bd601163 100644 --- a/eventmesh-runtime/conf/eventmesh.properties +++ b/eventmesh-runtime/conf/eventmesh.properties @@ -62,13 +62,19 @@ eventMesh.server.retry.plugin.type=default eventMesh.server.gracefulShutdown.sleepIntervalInMills=1000 eventMesh.server.rebalanceRedirect.sleepIntervalInMills=200 +# TLS +eventMesh.server.useTls.enabled=false +eventMesh.server.ssl.protocol=TLSv1.1 +eventMesh.server.ssl.cer=sChat2.jks +eventMesh.server.ssl.pass=sNetty + # ip address blacklist eventMesh.server.blacklist.ipv4=0.0.0.0/8,127.0.0.0/8,169.254.0.0/16,255.255.255.255/32 eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8 ########################## EventMesh HTTP Admin Configuration ########################## eventMesh.server.admin.threads.num=2 -eventMesh.server.admin.useTls.enabled=true +eventMesh.server.admin.useTls.enabled=false eventMesh.server.admin.ssl.protocol=TLSv1.3 eventMesh.server.admin.ssl.cer=eventmesh-admin-server.jks eventMesh.server.admin.ssl.pass=eventmesh-admin-server diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java index a8cf4f884d..287c222245 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java @@ -39,9 +39,6 @@ public class EventMeshHTTPConfiguration extends CommonConfiguration { @ConfigField(field = "http.port", notNull = true, beNumber = true) private int httpServerPort = 10105; - @ConfigField(field = "admin.http.port") - private int eventMeshServerAdminPort = 10106; - @ConfigField(field = "batchmsg.batch.enabled") private boolean eventMeshServerBatchMsgBatchEnabled = Boolean.TRUE; diff --git a/eventmesh-runtime/src/test/resources/configuration.properties b/eventmesh-runtime/src/test/resources/configuration.properties index 1f7c20a5bb..836fc9c981 100644 --- a/eventmesh-runtime/src/test/resources/configuration.properties +++ b/eventmesh-runtime/src/test/resources/configuration.properties @@ -40,7 +40,6 @@ eventMesh.server.provide.protocols=TCP,HTTP,GRPC # EventMeshHTTPConfiguration config eventMesh.server.http.port=1816 -eventMesh.server.admin.http.port=1817 eventMesh.server.batchmsg.batch.enabled=false eventMesh.server.batchmsg.threads.num=2816 eventMesh.server.sendmsg.threads.num=3816