From 7d3556e4ffe83f4704177c9afeec8450f73558b4 Mon Sep 17 00:00:00 2001 From: Angel Borroy Date: Mon, 10 Jun 2019 14:13:59 +0200 Subject: [PATCH] Working configuration for Sharding SSL. --- .../generators/app/index.js | 36 ++++++++------- .../generators/app/templates/6.1/.env | 2 +- .../app/templates/6.1/docker-compose-ee.yml | 46 +++++++++++++++++-- 3 files changed, 62 insertions(+), 22 deletions(-) diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js index ad1ac067c..6ff83a80b 100644 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js @@ -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" ) } ) diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env index a8f1947c6..c2a4ac53d 100755 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env @@ -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 diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml index d49f882f1..a0e134b78 100755 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml @@ -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') { %>