168. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/7/2018 11:36:00 AM Central Standard 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.

168.1 Files compared

#	Location	File	Last Modified
1	C:\SCRUB\MHED\MHED\VAR 4.10.0\var-resources-release-4.10@1091a011694	entrypoint.sh	Thu Oct 18 18:44:32 2018 UTC
2	C:\MHED-scrubbed\MHED\MHED\VAR 4.10.0\var-resources-release-4.10@1091a011694	entrypoint.sh	Fri Dec 7 13:05:24 2018 UTC

168.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	2	32
Changed	1	2
Inserted	1	1
Removed	0	0

168.3 Comparison options

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

168.4 Active regular expressions

No regular expressions were active.

168.5 Comparison detail

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 . DOMAIN . EX .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
		18	T