From 8f584c86fd8161f2a6810c98bc7fd738249705dc Mon Sep 17 00:00:00 2001 From: David Edwards Date: Fri, 31 May 2019 10:42:45 +0100 Subject: [PATCH] REPO-4400 Removed files and beans (#465) ssl.keystore and ssl.truststore have been deleted alongside their corresponding .properties files. ssl.keystore and ssl.truststore beans have been removed from encyption-contenxt.xml --- .gitignore | 3 +++ .../resources/alfresco/encryption-context.xml | 14 -------------- .../keystore/ssl-keystore-passwords.properties | 7 ------- .../keystore/ssl-truststore-passwords.properties | 5 ----- .../resources/alfresco/keystore/ssl.keystore | Bin 2756 -> 0 bytes .../resources/alfresco/keystore/ssl.truststore | Bin 740 -> 0 bytes 6 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties delete mode 100644 src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties delete mode 100644 src/main/resources/alfresco/keystore/ssl.keystore delete mode 100644 src/main/resources/alfresco/keystore/ssl.truststore diff --git a/.gitignore b/.gitignore index ff04b28cf1..39e0c15d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ *.class +# VSCode +.vscode/ + # Eclipse .classpath .settings diff --git a/src/main/resources/alfresco/encryption-context.xml b/src/main/resources/alfresco/encryption-context.xml index d1048874b5..fecdbf42e6 100644 --- a/src/main/resources/alfresco/encryption-context.xml +++ b/src/main/resources/alfresco/encryption-context.xml @@ -50,20 +50,6 @@ - - - - - - - - - - - - - - diff --git a/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties deleted file mode 100644 index 3a32c534d6..0000000000 --- a/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties +++ /dev/null @@ -1,7 +0,0 @@ -aliases=ssl.alfresco.ca,ssl.repo -# The ssl keystore password -keystore.password=kT9X6oe68t -# The password protecting the ssl repository key -ssl.repo.password=kT9X6oe68t -# The password protecting the ssl Alfresco CA key -ssl.alfresco.ca.password=kT9X6oe68t \ No newline at end of file diff --git a/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties deleted file mode 100644 index e5510fb03c..0000000000 --- a/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties +++ /dev/null @@ -1,5 +0,0 @@ -aliases=alfresco.ca -# The ssl truststore password -keystore.password=kT9X6oe68t -# The password protecting the ssl Alfresco CA strust certificate -alfresco.ca.password=kT9X6oe68t \ No newline at end of file diff --git a/src/main/resources/alfresco/keystore/ssl.keystore b/src/main/resources/alfresco/keystore/ssl.keystore deleted file mode 100644 index 3491f92e3b4d92f5d19dea4664c3897612f69a39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2756 zcmX?i?%X*B1_mZ5W@O+fF3!;_N-fA|U|_TqEbp2Ilw4xa#I(Rbij7m7jgf^>i%FQ# zfR}}%DbQ!ZKbcBVCPopKCZ-1G_nLR+7#}pKI8|bGC2*b26RVS%(sxfb{k-$zT>tL! zcW1Oz^h+1%o;tO3i==h!uBkoy1ulL|7gd}ayV54EBH-DrO>68Xd4|_G3LSfPz<49u z;oe%?!>(K(I6aQ*Oh5dBRqC+Blbu{mel1B?7C20)TWa<%I85b@((NX9vDSbZ*K38B zk8Wd9n=gHoqn~1+;|PolGs=G^s(( zNpwnKy~~CANiXz;zs8w}IlT5(&@!$od}9AO_5X(JKSX|Y{fU%)zg6#N4(oHiiPh=J zQyh=JlvjOR{OTkd=d5E4PyejGe(`z#YV*qbr{|hR&HWYN{^Zj`v0x{a1DBJxh`uxV z(y{CX`~Ju;dOU9h=XgAJUzy*S8DBN^`sI7a9T{IMHGAe+i8&Zs$#ca=&BzY;D0y;r z`?DuGW?TD$@~>D-0~3di&s!f|{5khfU&FbhuAuaoBIFV-qXs|G@H=&p|%@6Du|!Fwh7wwrWVL zvrRf`zFBUDV%sdWTl4(x@Awuz=}G1(#swG3xI;9}e}+1pSUEw@RDE0Vn&06(sd-ob zDw#hhZI;MlpBiR=t~Pqzue*AE44W>@I%@FtUG2fhQ`L6w{LXcq*z`tzJ6n~^>O|fR z4nJpq`1~lwX@Y;z)R&=c_rWQcHA2tSz!I2bQ-Db}!JvupBoimY|Id4FJ+0oQWWdYD zsnzDu_MMlJk(HIfAkC25fRl|ml!Z;0$=wOY;oxBk^)?hX5CqAv^KkhlW~QX(Wuzvi z7|I*Sf&{sE#2jg(@M${i&7PQN>cO;MGS;M3YdAg;R>7`4HU$A4UG&e z3=Is;j0_D7q9pi@41ogXhUQQKgT@A!?Wj%>Ms|uYHm3;Va*BWfAIK@(!t9}W*?IZp zd4@8;91L=turS@Xi6X3b;Ll%;bnai%adP1wx^|Mp1b_= zSNjHak-m$TE3JRN(qH9o*UA#5_%w88kC2>NHxMaV675pu=YDbFY zS2dYxpVf1e^fta(E1COf-7>CjCT2zkV3C6od(1$0CGcMUpQgjvB);fDLiDmz4L8zq zUIipv-n(Fvg22vKr-Q27>Y^T-{A-(ho+m-`r_RpH2PN3BJmu8>f3KcQqgm?QcVdMhdzSIr1uuMg%jn`xxio3^UA+pg~wi%u9bz?0hoU~-!S#H z*Y##{zh0S12Hj4jK@BE}-Z zEH&TW!p*v2Pc55B{cVn()>oo84dj72M^>3d!a%G6y8<4N0$~eUjzQ0NtG$ zvG#`r8JibIzj*nte}h(I>6^q&msjofw4e7%*Wy;Q7K@DdX8HJ;y1}c`-E+HSe*uUGytY*4DypS)5#)qG>r6L9Is531V}p+%Qoaw52jFMBs}G#wLB hijSt_!H|w$-#dKpq}C#r|29z>XOl}WoHcpW4*-@>^f&+j diff --git a/src/main/resources/alfresco/keystore/ssl.truststore b/src/main/resources/alfresco/keystore/ssl.truststore deleted file mode 100644 index 67273aff4f6f17507ea3de302153ac2dd6150fc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 740 zcmX?i?%X*B1_mY|W(3pRi8*OSsm00pddZ1EF-yUUl9LRq5qhQumOy0-44Rnc05R(V zW+p}^CQgQ?E6Lw-)NHOB@Un4gwRyCC=VfGMWo0l(GvqelWMd9xVH0L@cY<*^c$h-H z4TTK^K{D(-T)v5!DXDoGsfj6u@&>XXK`tIKN2mi7g7ec#$`gxH6?{rk^bAD|gg^?I zdAQ*UoE;4m#CZ*k3@i){49yJ9jZLB?_>ByK0_KM1PyxERq;WoS7%;LjFgNxx7&LY= zH8wK5(kLo9$R=-dhV7E6+qdtD6>>as|2tltki4S&d-09gR=4{u?Fv`>((xcq@!844AKfj}Ih-2*K3-Uz{=R7O$%zT7mDib=85tNC2N?K)16h`jMT|v+ zS!%w$g`0K5o?14M`r8~mt*=CH8ps2KSXP-u!a%G6y8<4N0$~ElT)T1a&@}PRYn|IIE{C!89-m_7n$+}tlI6|- z-JKe-_J;)-n-@mEc=@k?gH~hdo5W3*SMBz+pZ7}F;#RX3i;VbY`S_W-!K>2Wmp}ej zWWB4mr2bdY+dm=NZn^BQSN<_l