thingsboard-aplcache

diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index a3ca9d0..d2cac80 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -81,7 +81,7 @@ mqtt:
     worker_group_thread_count: "${NETTY_WORKER_GROUP_THREADS:12}"
 # Uncomment the following lines to enable ssl for MQTT
 #  ssl:
-#    key_store: keystore/mqttserver.jks
+#    key_store: mqttserver.jks
 #    key_store_password: server_ks_password
 #    key_password: server_key_password
 #    key_store_type: JKS

diff --git a/tools/src/main/shell/keygen.properties b/tools/src/main/shell/keygen.properties
index 9435746..8dd11f2 100644
--- a/tools/src/main/shell/keygen.properties
+++ b/tools/src/main/shell/keygen.properties
@@ -17,8 +17,8 @@
 DOMAIN_SUFFIX="$(hostname)"
 ORGANIZATIONAL_UNIT=Thingsboard
 ORGANIZATION=Thingsboard
-CITY=Piscataway
-STATE_OR_PROVINCE=NJ
+CITY=San Francisco
+STATE_OR_PROVINCE=CA
 TWO_LETTER_COUNTRY_CODE=US
 
 SERVER_KEYSTORE_PASSWORD=server_ks_password
@@ -26,10 +26,10 @@ SERVER_KEY_PASSWORD=server_key_password
 
 SERVER_KEY_ALIAS="serveralias"
 SERVER_FILE_PREFIX="mqttserver"
-SERVER_KEYSTORE_DIR="../../../../application/src/main/resources/keystore/"
+SERVER_KEYSTORE_DIR="/etc/thingsboard/conf"
 
-CLIENT_KEYSTORE_PASSWORD=client_ks_password
-CLIENT_KEY_PASSWORD=client_key_password
+CLIENT_KEYSTORE_PASSWORD=password
+CLIENT_KEY_PASSWORD=password
 
 CLIENT_KEY_ALIAS="clientalias"
 CLIENT_FILE_PREFIX="mqttclient"

diff --git a/tools/src/main/shell/server.keygen.sh b/tools/src/main/shell/server.keygen.sh
index cfeaa0c..cfa4683 100755
--- a/tools/src/main/shell/server.keygen.sh
+++ b/tools/src/main/shell/server.keygen.sh
@@ -122,25 +122,25 @@ fi
 
 if [[ $COPY = true ]]; then
     if [[ -z "$COPY_DIR" ]]; then
-        read -p  "Do you want to copy $SERVER_FILE_PREFIX.jks to server directory?[yes]" yn
-            while :
-            do
-                case $yn in
-                    [nN]|[nN][oO])
-                        break
-                        ;;
-                    [yY]|[yY][eE]|[yY][eE]|[sS]|[yY]|"")
-                        read -p "(Default: $SERVER_KEYSTORE_DIR): " dir
-                         if [[ !  -z  $dir  ]]; then
-                            DESTINATION=$dir;
-                         else
-                            DESTINATION=$SERVER_KEYSTORE_DIR
-                         fi;
-                         break;;
-                    *)  echo "Please reply 'yes' or 'no'"
-                        ;;
-                 esac
-             done
+        while :
+        do
+            read -p  "Do you want to copy $SERVER_FILE_PREFIX.jks to server directory? [Y/N]: " yn
+            case $yn in
+                [nN]|[nN][oO])
+                    break
+                    ;;
+                [yY]|[yY][eE]|[yY][eE]|[sS]|[yY]|"")
+                    read -p "(Default: $SERVER_KEYSTORE_DIR): " dir
+                     if [[ !  -z  $dir  ]]; then
+                        DESTINATION=$dir;
+                     else
+                        DESTINATION=$SERVER_KEYSTORE_DIR
+                     fi;
+                     break;;
+                *)  echo "Please reply 'yes' or 'no'"
+                    ;;
+             esac
+         done
     else
         DESTINATION=$COPY_DIR
     fi