From 8e30f4906c47263181efe2a778defaa21b715d9e Mon Sep 17 00:00:00 2001 From: Angel Borroy Date: Fri, 7 Jun 2019 11:22:37 +0200 Subject: [PATCH] Restoring default properties to provide a distribution according to documentation (https://docs.alfresco.com/search-enterprise/tasks/solr-install.html) --- .../noRerank/conf/solrcore.properties | 19 ++++++++++--------- .../templates/rerank/conf/solrcore.properties | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties index 053a4f153..e91ba7ee8 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrcore.properties @@ -35,15 +35,16 @@ alfresco.recordUnindexedNodes=false # none, https alfresco.secureComms=https -# ssl -#alfresco.encryption.ssl.keystore.type= -#alfresco.encryption.ssl.keystore.provider= -#alfresco.encryption.ssl.keystore.location= -#alfresco.encryption.ssl.keystore.passwordFileLocation= -#alfresco.encryption.ssl.truststore.type= -#alfresco.encryption.ssl.truststore.provider= -#alfresco.encryption.ssl.truststore.location= -#alfresco.encryption.ssl.truststore.passwordFileLocation= +# ssl, default values +# keystore and trustore files are not provided by default +alfresco.encryption.ssl.keystore.type=JCEKS +alfresco.encryption.ssl.keystore.provider= +alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore +alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties +alfresco.encryption.ssl.truststore.type=JCEKS +alfresco.encryption.ssl.truststore.provider= +alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore +alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties # Default Tracker alfresco.cron=0/10 * * * * ? * diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties index 0d89813e5..06f089370 100644 --- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties +++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties @@ -35,15 +35,16 @@ alfresco.recordUnindexedNodes=false # none, https alfresco.secureComms=https -# ssl -#alfresco.encryption.ssl.keystore.type= -#alfresco.encryption.ssl.keystore.provider= -#alfresco.encryption.ssl.keystore.location= -#alfresco.encryption.ssl.keystore.passwordFileLocation= -#alfresco.encryption.ssl.truststore.type= -#alfresco.encryption.ssl.truststore.provider= -#alfresco.encryption.ssl.truststore.location= -#alfresco.encryption.ssl.truststore.passwordFileLocation= +# ssl, default values +# keystore and trustore files are not provided by default +alfresco.encryption.ssl.keystore.type=JCEKS +alfresco.encryption.ssl.keystore.provider= +alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore +alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties +alfresco.encryption.ssl.truststore.type=JCEKS +alfresco.encryption.ssl.truststore.provider= +alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore +alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties # Default Tracker alfresco.cron=0/10 * * * * ? *