Commit 2b7ad325dc53f66d74e5cf6ea708435bccb52ac6
1 parent
bfb27e87
client.keygen.sh changed to pick certificate values from prop file
Showing
1 changed file
with
2 additions
and
2 deletions
@@ -74,7 +74,7 @@ echo "Generating SSL Key Pair..." | @@ -74,7 +74,7 @@ echo "Generating SSL Key Pair..." | ||
74 | 74 | ||
75 | keytool -genkeypair -v \ | 75 | keytool -genkeypair -v \ |
76 | -alias $CLIENT_KEY_ALIAS \ | 76 | -alias $CLIENT_KEY_ALIAS \ |
77 | - -dname "CN=$DOMAIN_SUFFIX, OU=Thingsboard, O=Thingsboard, L=San Francisco, ST=CA, C=US" \ | 77 | + -dname "CN=$DOMAIN_SUFFIX, OU=$ORGANIZATIONAL_UNIT, O=$ORGANIZATION, L=$CITY, ST=$STATE_OR_PROVINCE, C=$TWO_LETTER_COUNTRY_CODE" \ |
78 | -keystore $CLIENT_FILE_PREFIX.jks \ | 78 | -keystore $CLIENT_FILE_PREFIX.jks \ |
79 | -keypass $CLIENT_KEY_PASSWORD \ | 79 | -keypass $CLIENT_KEY_PASSWORD \ |
80 | -storepass $CLIENT_KEYSTORE_PASSWORD \ | 80 | -storepass $CLIENT_KEYSTORE_PASSWORD \ |
@@ -118,4 +118,4 @@ echo "Exporting client public key" | @@ -118,4 +118,4 @@ echo "Exporting client public key" | ||
118 | tail -n +$(($(grep -m1 -n -e '-----BEGIN CERTIFICATE' $CLIENT_FILE_PREFIX.pem | cut -d: -f1) )) \ | 118 | tail -n +$(($(grep -m1 -n -e '-----BEGIN CERTIFICATE' $CLIENT_FILE_PREFIX.pem | cut -d: -f1) )) \ |
119 | $CLIENT_FILE_PREFIX.pem >> $CLIENT_FILE_PREFIX.pub.pem | 119 | $CLIENT_FILE_PREFIX.pem >> $CLIENT_FILE_PREFIX.pub.pem |
120 | 120 | ||
121 | -echo "Done." | ||
121 | +echo "Done." |