inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-196: Adding keystore/truststore type to solr config

Browse Source
This commit is contained in:
Gethin James
2016-10-21 17:26:42 +02:00
parent 44d8ff616c
commit 160ec368df
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/config.properties
+7
View File
@@ -0,0 +1,7 @@
alfresco.solr.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.solr.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
${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">
packaging/pom.xml
+21 -6
View File
@@ -7,12 +7,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<alfresco.solr.config># Alfresco configuration
# This file is automatically included by solr. You can define your custom settings here
SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000"</alfresco.solr.config>
<alfresco.solr.config.win>REM Alfresco configuration
REM This file is automatically included by solr. You can define your custom settings here
set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000</alfresco.solr.config.win>
</properties>
<parent>
<groupId>org.alfresco</groupId>
@@ -36,6 +30,24 @@ set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.
<build>
<finalName>alfresco-solr-distribution-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>config.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -143,6 +155,9 @@ set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.
<replace token= "REM Set the thread stack size" value="${alfresco.solr.config.win}${line.separator}${line.separator}REM Set the thread stack size" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<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>
<chmod file="target/solr-${solr.version}/bin/solr" perm="755"/>
</target>
</configuration>