16 files changed, 36 insertions, 32 deletions
diff --git a/servers/0.10.0.0/resources/kafka.properties b/servers/0.10.0.0/resources/kafka.properties
index 7a19a11..7d8e2b1 100644
--- a/servers/0.10.0.0/resources/kafka.properties
+++ b/servers/0.10.0.0/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.10.0.1/resources/kafka.properties b/servers/0.10.0.1/resources/kafka.properties
index 7a19a11..7d8e2b1 100644
--- a/servers/0.10.0.1/resources/kafka.properties
+++ b/servers/0.10.0.1/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.10.1.1/resources/kafka.properties b/servers/0.10.1.1/resources/kafka.properties
index 7a19a11..7d8e2b1 100644
--- a/servers/0.10.1.1/resources/kafka.properties
+++ b/servers/0.10.1.1/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.10.2.1/resources/kafka.properties b/servers/0.10.2.1/resources/kafka.properties
index 7a19a11..7d8e2b1 100644
--- a/servers/0.10.2.1/resources/kafka.properties
+++ b/servers/0.10.2.1/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.11.0.0/resources/kafka.properties b/servers/0.11.0.0/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/0.11.0.0/resources/kafka.properties
+++ b/servers/0.11.0.0/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.11.0.1/resources/kafka.properties b/servers/0.11.0.1/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/0.11.0.1/resources/kafka.properties
+++ b/servers/0.11.0.1/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.11.0.2/resources/kafka.properties b/servers/0.11.0.2/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/0.11.0.2/resources/kafka.properties
+++ b/servers/0.11.0.2/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.9.0.0/resources/kafka.properties b/servers/0.9.0.0/resources/kafka.properties
index b70a0da..b4c4088 100644
--- a/servers/0.9.0.0/resources/kafka.properties
+++ b/servers/0.9.0.0/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/0.9.0.1/resources/kafka.properties b/servers/0.9.0.1/resources/kafka.properties
index 7a19a11..7d8e2b1 100644
--- a/servers/0.9.0.1/resources/kafka.properties
+++ b/servers/0.9.0.1/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/1.0.0/resources/kafka.properties b/servers/1.0.0/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/1.0.0/resources/kafka.properties
+++ b/servers/1.0.0/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/1.0.1/resources/kafka.properties b/servers/1.0.1/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/1.0.1/resources/kafka.properties
+++ b/servers/1.0.1/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/1.0.2/resources/kafka.properties b/servers/1.0.2/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/1.0.2/resources/kafka.properties
+++ b/servers/1.0.2/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/1.1.0/resources/kafka.properties b/servers/1.1.0/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/1.1.0/resources/kafka.properties
+++ b/servers/1.1.0/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/1.1.1/resources/kafka.properties b/servers/1.1.1/resources/kafka.properties
index f08855c..64f94d5 100644
--- a/servers/1.1.1/resources/kafka.properties
+++ b/servers/1.1.1/resources/kafka.properties
@@ -24,12 +24,16 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
+# List of enabled mechanisms, can be more than one
+sasl.enabled.mechanisms=PLAIN
+sasl.mechanism.inter.broker.protocol=PLAIN
+
 # The port the socket server listens on
 #port=9092
 
diff --git a/servers/2.0.0/resources/kafka.properties b/servers/2.0.0/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/2.0.0/resources/kafka.properties
+++ b/servers/2.0.0/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on
diff --git a/servers/2.0.1/resources/kafka.properties b/servers/2.0.1/resources/kafka.properties
index f08855c..28668db 100644
--- a/servers/2.0.1/resources/kafka.properties
+++ b/servers/2.0.1/resources/kafka.properties
@@ -24,10 +24,10 @@ broker.id={broker_id}
 listeners={transport}://{host}:{port}
 security.inter.broker.protocol={transport}
 
-ssl.keystore.location={ssl_dir}/server.keystore.jks
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
 ssl.keystore.password=foobar
 ssl.key.password=foobar
-ssl.truststore.location={ssl_dir}/server.truststore.jks
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
 # The port the socket server listens on