SEARCH-229: Cleaner fix for jetty-ssl.xml

This commit is contained in:
Gethin James
2016-11-04 09:20:04 +01:00
parent d028e1ce27
commit 83a99ee021
2 changed files with 5 additions and 4 deletions
+1 -3
View File
@@ -4,6 +4,4 @@ alfresco.solr.config=# Alfresco configuration. This file is automatically includ
${line.separator}SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000"
alfresco.solr.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
${line.separator}set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000
alfresco.solr.ssl.token= <Set name="excludeProtocols">
alfresco.solr.ssl.need=<Set name="NeedClientAuth"><Property name="solr.jetty.ssl.needclientauth" default="true"/></Set>
alfresco.solr.ssl.need.token=<Set name="NeedClientAuth"><Property name="solr.jetty.ssl.needClientAuth" default="false"/></Set>
alfresco.solr.ssl.token= <Set name="excludeProtocols">
+4 -1
View File
@@ -161,7 +161,10 @@
<replace token= "${alfresco.solr.ssl.token}" value="${alfresco.solr.ssl}${line.separator} ${alfresco.solr.ssl.token}" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty*.xml"/>
</replace>
<replace token= "${alfresco.solr.ssl.need.token}" value="${alfresco.solr.ssl.need}" dir="target/solr-${solr.version}">
<replace token= "needClientAuth" value="needclientauth" 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>
<chmod file="target/solr-${solr.version}/bin/solr" perm="755"/>