From fbe8d92356de292856acd2aeb5f1c015a5733341 Mon Sep 17 00:00:00 2001 From: da490c Date: Mon, 9 Apr 2018 14:55:42 -0400 Subject: [PATCH] Fix sparky ssl keystore Issue-ID: AAI-1013 Change-Id: I9f6ddd57055c9fdb9b3f1e6a02d68deffaa6b810 Signed-off-by: da490c --- sparky/appconfig/auth/inventory-ui-keystore | Bin 4254 -> 0 bytes sparky/appconfig/auth/tomcat_keystore | Bin 0 -> 2214 bytes sparky/appconfig/sparky-ssl-config.properties | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 sparky/appconfig/auth/inventory-ui-keystore create mode 100644 sparky/appconfig/auth/tomcat_keystore diff --git a/sparky/appconfig/auth/inventory-ui-keystore b/sparky/appconfig/auth/inventory-ui-keystore deleted file mode 100644 index 3319e639de12af2ae4d6b019474a8182b604a699..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4254 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 diff --git a/sparky/appconfig/auth/tomcat_keystore b/sparky/appconfig/auth/tomcat_keystore new file mode 100644 index 0000000000000000000000000000000000000000..9eec841aa2c1243b5ca3e22b0b116e5bca2afd49 GIT binary patch literal 2214 zcmcJQXHyf35{AvG`{CJ{ot=GmXP3T7-vj^vpko357Sz|n&7RYU`$h=up~Z`{XDvR*`$ zzz#)47haP~tv|D6mK5}zGvJ;XTcs8(8BRtSutt0nY_g%MoRa|;|Md5m6Fh;Jq2N{Y z_@3}C$JB}YtUs*Za?s`JeoMO1+r=63TnZY#qy*QgQqWyhEkSt;6nsS%)@q-fP~E0k z;;U!hctBy*u?73i4m--P-{w7I}r@otzjdND9D8ErKeeYe+W~WR6XoY%67E(c zKG2?clD{PU%-x8D{xsDjm8_i!Iz*!~sprgz-pbd|wD(J^B61Y&c8N|WjVZ|w(#tL3 z);vAKL47*5^D&KRS;w=+hJbeg9DS27bTdLTKaF?v@IGVZYIWHjnM2&;#FbO!hU2qE z+bdse`Ua`*ZDSbQ2`zDZPe8T@&;k+)>fplIw{8rpK#w_^oyy@JG-<*ytx4iE#yxnm0w= zsQ3mhmsjlZsqDe$)4tZiZ8RyqHRA(V@Z-;JVxjT&?A7`G1xSuj{d4T^ z`)2$ClX^CNSj2ZA7>6eiBWnlCZ#_k7+R{j3Zs3k}#59ZG%&egH70h}?*UV&AM*Nux zftp}&{@Bu4uYsw@OI5B^W#l8Gva3CRE@@gldvhn`*Zk<$Y0#?*w(wKl@IPPerG#ew zF#ma(&R;XYX7qXa!7I*7ye&-MlMsvA*gq!(+D7brD%esfz4f5p*wqG`A;*o|ZZ!I} z+5PP#v@U?VeeENz+c5~Ar}mueC$HJKfJ&S_*{uz6VF>tC@l@c(g?Mr?%9Bnz=F$N% zGJwGPmUyvf1q#=GQSz;4>Y0n!PhQ=nPlaG+ZKuVDSYCSTCB@@0XY72sTWR}GFu0sM zuJU)M7B9no2}*V)H*Q$sZ4bK=uc;9Z#*YlOBsxVL(zz4`vhyg-qhWGi7huPU<11)Y5*UN!14#^-uFzS7BV58VKr zEA@&jM5+va6#HX6u>AXmQdEdZs8yblX}kfBR64HCf0!aQRy-pc`BR7Bd{w0`La7pI zkm=yi-+ve=rYfwtttUgeMdb|Jcjx%UI#bu~NFgHk+;KiDl~>v4d7X3w z9rc55$0f!7n&sJ9{L+P^xOe}Ks>QqeF)(&V{YCm!er2w>_iX(t_Tivuge8N>R-3qr~xQviRhIz7E zmF2Mnc|_>mPq`r8ijUH>?@90qr{15OW~Xm0vAh-gzs|zfiNZj${Gzru|mOS5GWjURRewE_Y};HIkp*=k2hBQiz7ez0-g*`J z;kBFnkU1$tF0Q3m>%h|VsX%2p1>*X`1iB_Xsp#U?;-t;1ook?X4d(qVk*{RR6P$!( zp1b3J(1hT0hDnnDpuGp1ZS=|N6}7K@$PGzIw|!Z2!?d{VA_xow0CUArqA20xnF@14 z_#iwJi$B9~LoCv7gCyLen@bi+ATHT|ns~f5$0h;+Rx~^Phbuh2WcIpC_L=IRX6m;L zysyK_ECDymj03FucK5@FeBsQGhhk{RwcU?BM=B2vJs7~^Rk^HuniMI0TX6bN0{i~@uuQZjr@ z0~JCi^gFuj9Za{klpnkui<5%Dg>7HPFqAv?53G&aN9E0RU&+ronb{ED1*wh|l;Zsh_>tSL literal 0 HcmV?d00001 diff --git a/sparky/appconfig/sparky-ssl-config.properties b/sparky/appconfig/sparky-ssl-config.properties index 2c28336..b9e5d16 100644 --- a/sparky/appconfig/sparky-ssl-config.properties +++ b/sparky/appconfig/sparky-ssl-config.properties @@ -1,3 +1,3 @@ server.port = 8000 -server.ssl.key-store=file:${CONFIG_HOME}/auth/inventory-ui-keystore -server.ssl.key-alias=1 \ No newline at end of file +server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore +server.ssl.key-alias=tomcat \ No newline at end of file -- 2.16.6