Produced by Araxis Merge on 5/10/2018 8:40:51 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
# | Location | File | Last Modified |
---|---|---|---|
1 | MHED_APPS_CIF.zip\VAR v4.2.7\var-resources-4.2.7@54bdc2933ef.zip | entrypoint.sh | Thu Apr 19 17:52:30 2018 UTC |
2 | MHED_APPS_CIF.zip\VAR v4.2.7\var-resources-4.2.7@54bdc2933ef.zip | entrypoint.sh | Thu May 3 13:06:22 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 32 |
Changed | 1 | 2 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
Whitespace | |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
1 | #!/bin/bas h | |
2 | ||
3 | echo "Chec king consu l for app configs" | |
4 | SVC_KEY_PK CS12=$(cur l $CONSUL_ SERVER/v1/ kv/$CONSUL _PATH/SVC_ KEY_PKCS12 -H "X-Con sul-Token: $CONSUL_T OKEN" | jq -r '.[0]. Value' | b ase64 --de code) | |
5 | SVC_KEY_PK CS12_PWD=$ (curl $CON SUL_SERVER /v1/kv/$CO NSUL_PATH/ SVC_KEY_PK CS12_PWD - H "X-Consu l-Token: $ CONSUL_TOK EN" | jq - r '.[0].Va lue' | bas e64 --deco de) | |
6 | SVC_KEYSTO RE_PWD=$(c url $CONSU L_SERVER/v 1/kv/$CONS UL_PATH/SV C_KEYSTORE _PWD -H "X -Consul-To ken: $CONS UL_TOKEN" | jq -r '. [0].Value' | base64 --decode) | |
7 | ||
8 | if [[ -n $ SVC_KEY_PK CS12 && -n $SVC_KEY_ PKCS12_PWD ]]; then | |
9 | defaul tKeystoreP wd=${SVC_K EYSTORE_PW D:-changei t} | |
10 | ||
11 | echo $ SVC_KEY_PK CS12 | bas e64 -d > v amf_temp_k eystore.p1 2 && \ | |
12 | keytool -v -importke ystore -sr ckeystore vamf_temp_ keystore.p 12 -srcsto retype PKC S12 -srcst orepass ${ SVC_KEY_PK CS12_PWD} -destkeyst ore var.mo bilehealth . DNS .jks -dest storetype JKS -alias 1 -destal ias var -d estkeypass $defaultK eystorePwd -deststor epass $def aultKeysto rePwd | |
13 | else | |
14 | ec ho "SVC_KE Y_PKCS12 a nd/or SVC_ KEY_PKCS12 _PWD envir onment var iables wer e not set, so not im porting ke ys." | |
15 | fi | |
16 | ||
17 | envconsul -consul $C ONSUL_SERV ER -token $CONSUL_TO KEN -prefi x $CONSUL_ PATH $CATA LINA_HOME/ bin/catali na.sh run |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.