From: dglFromAtt Date: Fri, 22 Mar 2019 17:48:48 +0000 (-0400) Subject: Include p12 file in AAF artifacts X-Git-Tag: 1.1.1~7 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fbuscontroller.git;a=commitdiff_plain;h=076d12181a51bebe7e2cbb1a9e9fef38e8006cfe Include p12 file in AAF artifacts Change-Id: I29c9c0cafad29ea1d133b66901584ce20d6daacb Signed-off-by: dglFromAtt Issue-ID: DMAAP-1123 Signed-off-by: dglFromAtt --- diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.cred.props b/dmaap-bc/misc/org.onap.dmaap-bc.cred.props index 875685a..fe47e47 100644 --- a/dmaap-bc/misc/org.onap.dmaap-bc.cred.props +++ b/dmaap-bc/misc/org.onap.dmaap-bc.cred.props @@ -1,16 +1,17 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2019-03-22T15:53:47.004+0000 +# on 2019-03-22T17:37:39.746+0000 # @copyright 2016, AT&T ############################################################ -Challenge=enc:OxW-E7xqr9z57LllxfH4HSrq_o33KMJ9YKWkOnVrkgO1oOKXTK4TJZ8R1uTSHqav +Challenge=enc:0B6_pOsEETnPFnQpfT0cppU1iw8hQ4580YF98UfazICvACybbPP8e7bOCtu6I3j3 cadi_alias=dmaap-bc@dmaap-bc.onap.org -cadi_key_password=enc:7lP3RwclwNHe2--eS0UA9mhf2En0IXHWOCT1rsOHLI6tNuFq1deq0RudTLTOsLKR +cadi_key_password=enc:xzyD6s2QtG6dnrpgXFd3cJvzQQP8cO-XuSYugfJsKiGeUjNla6Ty6LeiuAn6sD2o cadi_keyfile=/opt/app/osaaf/local/org.onap.dmaap-bc.keyfile -cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-bc.jks -cadi_keystore_password=enc:XA1RiJvjtWJ97FDao3XLr60Y1gq3moVyUeFfF-PHwzU_xCEdSs3dMdJyfS9IREId -cadi_keystore_password_jks=enc:XA1RiJvjtWJ97FDao3XLr60Y1gq3moVyUeFfF-PHwzU_xCEdSs3dMdJyfS9IREId +cadi_keystore=/opt/app/osaaf/local/org.onap.dmaap-bc.p12 +cadi_keystore_password=enc:3rLfxd-_WPUHEzYIbt2Cb9PwWOFkIQWBf_2DuHUOGJ4h_-gQjtTsx-h7H8qfkxC9 +cadi_keystore_password_jks=enc:VWdS8tbPO6JcL0gwj9mbV0fKSzWIP6NXLWaz9L1O309Dho9qo7wyJxeF8wR-8_wi +cadi_keystore_password_p12=enc:3rLfxd-_WPUHEzYIbt2Cb9PwWOFkIQWBf_2DuHUOGJ4h_-gQjtTsx-h7H8qfkxC9 cadi_truststore=/opt/app/osaaf/local/org.onap.dmaap-bc.trust.jks -cadi_truststore_password=enc:_Q8oomnxWkgjgT6C2v7dy7gh_bRTGjO7CuWniPexwwts3lk5vBV2hlHZHAGBnRC4 +cadi_truststore_password=enc:pVXSw1tBNOOFYnovbI1tHlS_d4dvY0eQyWkhBsRavMRv6DiI9i8WMN5wVrM4KnUY cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh b/dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh index e8a8647..861223c 100644 --- a/dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh +++ b/dmaap-bc/misc/org.onap.dmaap-bc.crontab.sh @@ -1,7 +1,7 @@ #!/bin/bash /opt/app/osaaf/local/org.onap.dmaap-bc.crontab.sh # Certificate Manager Crontab Loading Script # Add/Update a Crontab entry, that adds a check on Certificate Manager generated Certificate nightly. -# Generated by Certificate Manager 2019-03-22T15:53:47.001Z +# Generated by Certificate Manager 2019-03-22T17:37:39.745Z TFILE="/tmp/cmcron$$.temp" DIR="/opt/app/osaaf/local" CF="org.onap.dmaap-bc Certificate Check Script" diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.jks b/dmaap-bc/misc/org.onap.dmaap-bc.jks index cbd4e75..5f34374 100644 Binary files a/dmaap-bc/misc/org.onap.dmaap-bc.jks and b/dmaap-bc/misc/org.onap.dmaap-bc.jks differ diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.keyfile b/dmaap-bc/misc/org.onap.dmaap-bc.keyfile index 106bcf7..a50f742 100644 --- a/dmaap-bc/misc/org.onap.dmaap-bc.keyfile +++ b/dmaap-bc/misc/org.onap.dmaap-bc.keyfile @@ -1,27 +1,27 @@ -grhgSeBxyYxM1opKmQ6GUd6LZHPxTQC8DzZfkVHbK7AtlE1e6foxPxVmH3u1jeKAYREqYuji-XjX -BEMkC4JA3ml6KO1SFKJhAu-rYvvI3OULYoh2qFvYMvzcI2Ytp-ESu8249s1SANYcV7GbWMbMaR-x -tB_LOlCvVYM1btAM5wklZyKRMz3xNaM91hZjeF1SKQAiBsT4F65jWNw0fV4RY2_mbzkYSvhFFxtJ -hYOab-NY_2aRm0hs0bHL982EzG3wSbF57l7oTm9iqbxxx64TdjQzRietouhyh3rWQf72HTgQiG0T -gJEJNp3TN6P83Hau7XpUjmACcifZG8eEoaTNlLtqadiJ5RhTShP3Zyt_ASx0WXCgN6CTE9-b2Jiq -M664Y_9egWNSmPmvQ4gwYWy_yO8z6tj06jCtTuzCxHEsprOzkvu_kSIMJv4WtiEe0sOR6CYgqY9l -iN2e7Hmvj2vRnaSk7DtJKRJlc-XyzYebFhGFIUGCvU3WXtk1-uUI7A7mFxMnwSskiqRAfLb6lyFc -IgdH53POntuL9KQmh3LGRwHjKQGwrNElbvfMFjLrUtqKsJf3zFhrJ8_PUymkLR9XWmm7rdWZHx9l -69w2frojHQ_NngaF8LOwjeHw6eYOuSw0YU23PYtEQsKvp1Hemu6uPgeur5bmnYRgLuJLQEVEb2rk -F1JDa2vb4uOeySeji0GNGTNsnHGoCvkoGWlTLYhksfHjRHULml2VEaEIAS3Ssh0SRJCtxWijljS6 -21i6JJtryCS37B2IvjICs8WPBBC9IW2NbaUZT0KnEzOusWqzV8tq-QfmeHBphoqsJqSODQoatXla -UnnF2LvNWKg34VWCJTyxmukU0_nMWukcykLRPY3cDqqV1QVabAy79pmG_o23Bs1s0yPeyl5pfH17 -Fr-nkduDnLu4qsjpCJQOh0ZQPjieYCRbEDcaZw9bo3eUfo28zqxOn0Xu23vHs04Qi41sIeyDZN4p -tpopNIHtYLYI8lpXQPssbgBPDJj8UcSsTgxqpMm1rMyjL55td0wIvE8QJq4TY9qNCws4pzo1nuQ5 -JmkmVeBUzQTOkkMJ5ST7yFgQa0PRkhPrnN0hKIDBUkW0EUzbZmLnii5mwIJWb8_CdZr_rHWxgyry -7x7elErt7AtKIuqQcP5KgRcwEF5V5sk1CqF5fmI3aMoskBeqDUNyF4pXD0Mgpr4dMTDpYbC0lDei -3_dMg44NnryOE0H1AmVv3C0l3JKXEIcjta6mHzmBq4kr5hJzNl4XQ0BZ-I51Aa3jsjimPa0v4VrB -nplxeAVw_4hr6N6ywdjLy5JnYSPAgsP45gUp-_kaUhchzdZ3PvImfXoM_t-qovPbVOJZz8buOPy1 -5o9Gt2DBcTgzS5PLAtAgHwO00pDnZe6wN5erDudxanY9fv106XitfrA60qT6kQq8iDQUBry43iH_ -wVeSuqkMbJulJB8-WmwBrap_2QrMvwLX4AIq8EGTNs3hh59f_TOBXK3OD4tRk-SGwop4oZkZ7NCM -uPH-ej8HhGRUNAPkRlmLiQjC2VTIJ6z1IVpwHk7pgyl1xoM4uKsfF334FIW2Blj-Tdy5LzZcXOU5 -SgK3hUIF9NdaygJzkCloEJ-K8YaLTsA8hJmwLhw8gSGDRdPY-nq_BkfCIAQ3zm-kASxLAzho3-Dv -xmtEF9YHB8ZcFQQsgAwpqRfYcqC2xMSJXxJDfAalBNIol1WbqogravhpHUXQqYiv8XpoFQIDpwZX -4ercBintEGChKVDhGiDbUASGlxtxROVl20FETSrl_npir_gLIYIaW8PhgiP3AmEg0vC1PK_GI_0b -HW7fxI83R8Q1Y34zXcelvQ3IzSQsCMODN0-7at_rlsAnS8xGAAe3-9mehZBF_7qFBNWgyXX6wYz3 -1zSUBEaktssemOHaXxZrQdUsNDkpvUd6ZE7EY0F1DJiYXaalW6eOrp41SBQJC9MF53Bi7hN6Eji6 -pKUrooyj17dB1rAmp42GHSHvOG19hFHKGlPxjHzBjXlzwzk30QMh7cO8vd1V4UC8BsLKOQTy \ No newline at end of file +AAxU7-TUq8pEp4SVZwpl8rgDrfEjngBUATPivJjmkw65Lg9H2pAyegluPdIBaMiSwV0gGk9PQ8x3 +3k1jb9c0Kt1aSOQpEqHOE44IlqCv8tX5bglqKy0PucUPVppp30nmiMWMVCi5szRfzeG_Vppcv_2u +rbeor-oKC2B5nsyIVMaVnsNMSCwbNAqVf_h4lqB0CtNu_6fXXAxu9xrRvahHHoEeOGXqZI9WdqFF +ds3-gjW8jpyI38u1yckF3-PYGi344KUy--uM4KHNnTfsFMwSwnZnIzzC5vxLt7b-lXRmlk02G6LC +vHwPVVZv0U7qFYwikZdS93k3OwQCVezKGARzdaoycLKaDjsUtqFNJSFSNEaIX9AU37PBRDsaApxe +glG-jbvqMBhjcHaAkSFLA_GKKslvHfyeUdRz_8-WAykn7RfNo45uGlMuNlNz8yvwUZcYfYOTd6Kz +TnPh4c1bxgJFMZrn2X2PK0SB5l-4iwNA5UvXD5QuMdVMSxHaXGi_TioJauSrHLMJvpdzjPK8l46O +etcN8KwOjMuhJEgXv7asz2WwlFlJ81IOYi6ynIqgziymZK39dFCWjj1FBbc5ZmawGfm-uoICNNAf +iPVIwYJjD1YF288tgxBP4--dmqyldpBtecUvck_5t3xdV-BH8CqsjfMnXnyg3nvxLDbI-tnzw8Hd +dmZe3T1WSyofqhiZlmcIZEJk_sU7u-oZcseTO5qc1_dgi16sfyhzwlFZOmMqp4Bk2oZFyyDpk4Tr +g9qJVJQIOLDSaU-CkZ9IW89-MgKEl_ESmYWPt1Q3wdOGBDeNnZvtj6YStpIVsPyofK1yimhAL2jk +OIklv6m-ri2cmWFY9q8ZYmHVEA1iMnw_oLRMfp7s6-RRSQALPK51QEy9PXR9JQ9R7_RK_KU6wMq4 +LTQAzOqu8xVmFbLZxcAiwVs8fV8ukgesMosWXHT1fLDWRlOi9ePfiauHOkGl64M8e6p6IUo5T1dg +fg-vwZCYoeJJ8NEnK0sU7z0OZGS8ECI9sXZ9lAweQqQQBnGa5md0XW25r8svJgFrtAq2_d2G-qla +6Dk00zgzJ3iQNuBA9Tgxr7qP0wro8tRi_ejPC2_0C3DIohFbuGpabMeMFomFAhzMLLZQrdJB_rrs +heAXW3vieVDQkrojelrpuCDST2vveH01ksxaC7ZTtVAk_jVsoLi7wgTHW7IseoJf0FnMB-rxd_qn +umfug96KFtVgVens_8mzNUV1SNFXdfW0J5-qG17TaV_Ynm8S1Fuu1usYiuNZjtmkMuo0hRoVasFK +C3n3qK4WlB0C0abmuR2HiqqrEKRKcZyG3X7cgkhdgiD85yqBVlABXfrgXk6XCbKAt6XVykFHbGhm +X9W3jOltRgNNa_MPYARwqqWu_3CJ83FLJI1FxtP--O7rFj1pPLM38zmUf3Hjz2pfn6EnapEfQ_qq +FNyXK-wxf_7OFKmiZM0UMRICbTA8BBuhfCsYhqMIDqGwd9zMXmnw1ylVj_WFbGCj7swkgI04KSrv +mn64Ct33G13Nf6FDF0e4qOMkjSRrpo51HEE-4SY7MiKjCTAev9Oqf-gRgQ_m6KfzcmkfOsk3goYu +6yvWL4vNPaWTnx49eVyzOMck-UdWBIGWUIALDuKFV6b-WwwSUWj-p6dJGL48lgnEzrCsaZsdcFTv +UgYl1Up3v2NBCmQ6Hv7XWr-r2WE9YiI7wF6pfqhKQ_81A039iQjo6KM0O8tf6b35K40n9Ekudu6D +tG5_GKwPKdd9DZ-VcDzN-g1yYganDHyMLVAX2xvj4rcG5BtFaZgoMZ75BfMRsZ1mpt5vr8aOP98V +1CA-XLM68PPmS_0vj5iKx9Fnk7pw0aRfjLsOwTDuzt4q7Zikz7UE9-HOlSJTu3Apy4cVacqHHhdu +U714tAhWxp0onTVOVC4lVGIQJU9qGSNvyF7bl-gouwFxTAgAr-AfDC0Ny6VL8KEspybFSH75ixBw +a0GAScwtvEtbZnLKOsS7-MpqI0fSCd6XQzqqXuNWS-V17kX5zOy5CjiKPdZkWDX0vLc__bL- \ No newline at end of file diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.location.props b/dmaap-bc/misc/org.onap.dmaap-bc.location.props index c3aa52d..2507ce4 100644 --- a/dmaap-bc/misc/org.onap.dmaap-bc.location.props +++ b/dmaap-bc/misc/org.onap.dmaap-bc.location.props @@ -1,7 +1,7 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2019-03-22T15:53:40.958+0000 +# on 2019-03-22T17:37:33.688+0000 # @copyright 2016, AT&T ############################################################ cadi_latitude=38.000 diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.p12 b/dmaap-bc/misc/org.onap.dmaap-bc.p12 new file mode 100644 index 0000000..eae6c97 Binary files /dev/null and b/dmaap-bc/misc/org.onap.dmaap-bc.p12 differ diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.props b/dmaap-bc/misc/org.onap.dmaap-bc.props index eb1ee34..5de2eb3 100644 --- a/dmaap-bc/misc/org.onap.dmaap-bc.props +++ b/dmaap-bc/misc/org.onap.dmaap-bc.props @@ -1,7 +1,7 @@ ############################################################ # Properties Generated by AT&T Certificate Manager # by root -# on 2019-03-22T15:53:40.960+0000 +# on 2019-03-22T17:37:33.690+0000 # @copyright 2016, AT&T ############################################################ aaf_id=dmaap-bc@dmaap-bc.onap.org diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.showpass b/dmaap-bc/misc/org.onap.dmaap-bc.showpass index 726f08d..7c93e96 100644 --- a/dmaap-bc/misc/org.onap.dmaap-bc.showpass +++ b/dmaap-bc/misc/org.onap.dmaap-bc.showpass @@ -1,8 +1,9 @@ -cadi_truststore_password=A#9rV6*QCeyy},UgV?CNC&jy -cadi_keystore_password_jks=[.mX5C5tQmbvxi&wRthPm3p* -cadi_key_password=[.mX5C5tQmbvxi&wRthPm3p* -cadi_keystore_password=[.mX5C5tQmbvxi&wRthPm3p* -Challenge=SKm$U}1KgNHe!8oefHO}9,h. -2019-03-22T16:32:36.333+0000: Trans Info - REMOTE Show Password 2258.2844ms +cadi_truststore_password=8b&R5%l$l:@jSWz@FCs;rhY* +cadi_keystore_password_jks=Y@Y5f&gm?PAz,CVQL,lk[VAF +cadi_key_password=2U[iOZzMHI:.#tdCwlBqc;}S +cadi_keystore_password=2U[iOZzMHI:.#tdCwlBqc;}S +cadi_keystore_password_p12=2U[iOZzMHI:.#tdCwlBqc;}S +Challenge=9H83TErBrN!u?;]1iCK@&69? +2019-03-22T17:38:32.447+0000: Trans Info + REMOTE Show Password 2214.6292ms diff --git a/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks b/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks index b5d74f4..6e35eed 100644 Binary files a/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks and b/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks differ