From e49c713a20f54781a787b07bf3a5b3118c8c3a2f Mon Sep 17 00:00:00 2001
From: mp-loki <valerii.sosliuk@gmail.com>
Date: Fri, 5 Jan 2018 21:38:58 -0500
Subject: [PATCH] client.keygen.sh script fix

---
 tools/src/main/shell/client.keygen.sh  | 4 ++--
 tools/src/main/shell/keygen.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/src/main/shell/client.keygen.sh b/tools/src/main/shell/client.keygen.sh
index 2e83ef0ef0..bb59077ba7 100755
--- a/tools/src/main/shell/client.keygen.sh
+++ b/tools/src/main/shell/client.keygen.sh
@@ -74,13 +74,13 @@ echo "Generating SSL Key Pair..."
 
 keytool -genkeypair -v \
   -alias $CLIENT_KEY_ALIAS \
-  -dname "CN=$DOMAIN_SUFFIX, OU=$ORGANIZATIONAL_UNIT, O=$ORGANIZATION, L=$CITY, ST=$STATE_OR_PROVINCE, C=$TWO_LETTER_COUNTRY_CODE" \ 
   -keystore $CLIENT_FILE_PREFIX.jks \
   -keypass $CLIENT_KEY_PASSWORD \
   -storepass $CLIENT_KEYSTORE_PASSWORD \
   -keyalg RSA \
   -keysize 2048 \
-  -validity 9999
+  -validity 9999 \
+  -dname "CN=$DOMAIN_SUFFIX, OU=$ORGANIZATIONAL_UNIT, O=$ORGANIZATION, L=$CITY, ST=$STATE_OR_PROVINCE, C=$TWO_LETTER_COUNTRY_CODE"
 
 echo "Converting keystore to pkcs12"
 keytool -importkeystore  \
diff --git a/tools/src/main/shell/keygen.properties b/tools/src/main/shell/keygen.properties
index 8dd11f2ea4..a01b782a74 100644
--- a/tools/src/main/shell/keygen.properties
+++ b/tools/src/main/shell/keygen.properties
@@ -17,7 +17,7 @@
 DOMAIN_SUFFIX="$(hostname)"
 ORGANIZATIONAL_UNIT=Thingsboard
 ORGANIZATION=Thingsboard
-CITY=San Francisco
+CITY=SF
 STATE_OR_PROVINCE=CA
 TWO_LETTER_COUNTRY_CODE=US