SEARCH-371: Correcting the SSL config

This commit is contained in:
Gethin James
2017-06-05 15:51:09 +02:00
parent 171034e03a
commit cb75f27f1d
2 changed files with 4 additions and 6 deletions
@@ -1,6 +1,3 @@
alfresco.search.ssl=<Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="JCEKS"/></Set>\
${line.separator} <Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="JCEKS"/></Set>
alfresco.search.ssl.token= <Set name="excludeProtocols">
alfresco.search.ssl.need.token=needClientAuth" default="false"
alfresco.search.ssl.need=needclientauth" default="true"
alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
+4 -3
View File
@@ -174,15 +174,16 @@
<replace token= "REM Anything you add to the SOLR_OPTS" value="${alfresco.search.config.win}${line.separator}${line.separator}REM Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "${alfresco.search.ssl.token}" value="${alfresco.search.ssl}${line.separator} ${alfresco.search.ssl.token}" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty*.xml"/>
</replace>
<replace token= "${alfresco.search.ssl.need.token}" value="${alfresco.search.ssl.need}" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty-ssl.xml"/>
</replace>
<replace token= "wantClientAuth" value="wantclientauth" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty-ssl.xml"/>
</replace>
<replace token= "STORE_TYPE=JKS" value="STORE_TYPE=JCEKS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
<include name="**/bin/solr.in.sh"/>
</replace>
<chmod file="target/solr-${solr.version}/bin/solr" perm="755"/>
</target>
</configuration>