From ac61b300625cf0ec37a160cd444f0fd33def0989 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 3 Jun 2016 16:03:12 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 124281 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124275 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 124171 jphuynh: MNT-15874: Fix missing Remote Solr configuration properties. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../bitrock/bitrock/alfresco/shared/alfresco-global.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties index 1db5a9804c..67dbda97bc 100644 --- a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties +++ b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties @@ -63,7 +63,8 @@ dir.license.external=@@BITROCK_ALFRESCO_LICENSE_DIR@@ ### Solr indexing ### index.subsystem.name=solr4 dir.keystore=${dir.root}/keystore -solr.port.ssl=@@BITROCK_TOMCAT_SSL_PORT@@ +solr.host=localhost +solr.port.ssl=@@BITROCK_SOLR_SSL_PORT@@ ### Smart Folders Config Properties ### smart.folders.enabled=false