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

Working configuration for Sharding SSL.

Browse Source
This commit is contained in:
Angel Borroy
2019-06-10 14:13:59 +02:00
parent b986d8c529
commit 7d3556e4ff
3 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/generator-alfresco-docker-compose/generators/app/index.js
+19 -17
View File
@@ -129,7 +129,7 @@ module.exports = class extends Generator {
alfrescoPort: (this.props.httpMode == 'http' ? '8080' : '8443'),
searchImage: (this.props.insightEngine ?
"quay.io/alfresco/insight-engine" :
"alfresco/alfresco-search-services"
"quay.io/alfresco/search-services"
),
searchTag: (this.props.insightEngine ?
"SEARCH_TAG" :
@@ -172,20 +172,22 @@ module.exports = class extends Generator {
"alfresco/alfresco-content-repository")
}
)
this.fs.copyTpl(
this.templatePath(this.props.acsVersion + '/search-https'),
this.destinationPath('search-https'),
{
searchImage: (this.props.insightEngine ?
"quay.io/alfresco/insight-engine" :
"alfresco/alfresco-search-services"
),
searchPath: (this.props.insightEngine ?
"alfresco-insight-engine" :
"alfresco-search-services"
)
}
)
if (!this.props.sharding) {
this.fs.copyTpl(
this.templatePath(this.props.acsVersion + '/search-https'),
this.destinationPath('search-https'),
{
searchImage: (this.props.insightEngine ?
"quay.io/alfresco/insight-engine" :
"alfresco/alfresco-search-services"
),
searchPath: (this.props.insightEngine ?
"alfresco-insight-engine" :
"alfresco-search-services"
)
}
)
}
if (this.props.zeppelin == true) {
this.fs.copy(
this.templatePath(this.props.acsVersion + '/zeppelin-https'),
@@ -225,7 +227,7 @@ module.exports = class extends Generator {
{
searchImage: (this.props.insightEngine ?
"quay.io/alfresco/insight-engine" :
"alfresco/alfresco-search-services"
"quay.io/alfresco/search-services"
)
}
)
@@ -236,7 +238,7 @@ module.exports = class extends Generator {
{
searchImage: (this.props.insightEngine ?
"quay.io/alfresco/insight-engine" :
"alfresco/alfresco-search-services"
"quay.io/alfresco/search-services"
)
}
)
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
+1 -1
View File
@@ -1,6 +1,6 @@
# Community
ALFRESCO_CE_TAG=6.1.2-ga
SEARCH_CE_TAG=1.3.0.1
SEARCH_CE_TAG=latest
# Enterprise
ALFRESCO_TAG=6.1.0.3
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
+42 -4
View File
@@ -111,9 +111,28 @@ services:
SOLR_SOLR_PORT: "8983"
#Create the default alfresco and archive cores
SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
SOLR_JAVA_MEM: "-Xms2g -Xmx2g"
SOLR_JAVA_MEM: "-Xms2g -Xmx2g" <% if (httpMode == 'https') { %>
SOLR_SSL_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.truststore"
SOLR_SSL_TRUST_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_TRUST_STORE_TYPE: "JCEKS"
SOLR_SSL_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.keystore"
SOLR_SSL_KEY_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_KEY_STORE_TYPE: "JCEKS"
SOLR_SSL_NEED_CLIENT_AUTH: "true"
SOLR_SSL_CLIENT_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.keystore"
SOLR_SSL_CLIENT_KEY_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_CLIENT_KEY_STORE_TYPE: "JCEKS"
SOLR_SSL_CLIENT_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.keystore"
SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_CLIENT_TRUST_STORE_TYPE: "JCEKS"
SOLR_OPTS: "
-Dsolr.ssl.checkPeerName=false
-Dsolr.allow.unsafe.resourceloading=true
" <% } %>
ports:
- 8083:8983 #Browser port
- 8083:8983 <% if (httpMode == 'https') { %>
volumes:
- ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
solr6shard2:
build:
@@ -133,9 +152,28 @@ services:
SOLR_SOLR_PORT: "8983"
#Create the default alfresco and archive cores
SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
SOLR_JAVA_MEM: "-Xms2g -Xmx2g"
SOLR_JAVA_MEM: "-Xms2g -Xmx2g" <% if (httpMode == 'https') { %>
SOLR_SSL_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.truststore"
SOLR_SSL_TRUST_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_TRUST_STORE_TYPE: "JCEKS"
SOLR_SSL_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.keystore"
SOLR_SSL_KEY_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_KEY_STORE_TYPE: "JCEKS"
SOLR_SSL_NEED_CLIENT_AUTH: "true"
SOLR_SSL_CLIENT_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.keystore"
SOLR_SSL_CLIENT_KEY_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_CLIENT_KEY_STORE_TYPE: "JCEKS"
SOLR_SSL_CLIENT_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl.repo.client.keystore"
SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD: "kT9X6oe68t"
SOLR_SSL_CLIENT_TRUST_STORE_TYPE: "JCEKS"
SOLR_OPTS: "
-Dsolr.ssl.checkPeerName=false
-Dsolr.allow.unsafe.resourceloading=true
" <% } %>
ports:
- 8084:8983 #Browser port
- 8084:8983 <% if (httpMode == 'https') { %>
volumes:
- ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
<% } %>
<% if (clustering == 'true') { %>