From 2c8d7e74124ad0d58c652383043854f824373966 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 28 Jul 2020 11:14:58 +0100 Subject: [PATCH] SEARCH-2365: Backport SEARCH-1915 changes to 1.5.x --- .../README.md | 22 +- .../generators/app/index.js | 24 +- .../generators/app/templates/6.2/.env | 18 +- .../app/templates/6.2/docker-compose-ce.yml | 12 +- .../app/templates/6.2/docker-compose-ee.yml | 85 +---- .../app/templates/images/search/Dockerfile | 31 +- .../keystores/{ => 6.x}/alfresco/keystore | Bin .../alfresco/keystore-passwords.properties | 0 .../ssl-keystore-passwords.properties | 0 .../ssl-truststore-passwords.properties | 0 .../keystores/{ => 6.x}/alfresco/ssl.keystore | Bin .../{ => 6.x}/alfresco/ssl.truststore | Bin .../keystores/{ => 6.x}/client/browser.p12 | Bin .../solr/ssl-keystore-passwords.properties | 0 .../solr/ssl-truststore-passwords.properties | 0 .../{ => 6.x}/solr/ssl.repo.client.keystore | Bin .../{ => 6.x}/solr/ssl.repo.client.truststore | Bin .../zeppelin/ssl.repo.client.keystore | Bin .../zeppelin/ssl.repo.client.truststore | Bin .../templates/keystores/7.x/alfresco/keystore | Bin 0 -> 327 bytes .../keystores/7.x/alfresco/ssl.keystore | Bin 0 -> 3255 bytes .../keystores/7.x/alfresco/ssl.truststore | Bin 0 -> 1832 bytes .../keystores/7.x/client/browser.p12 | Bin 0 -> 3033 bytes .../7.x/solr/ssl-repo-client.keystore | Bin 0 -> 3265 bytes .../7.x/solr/ssl-repo-client.truststore | Bin 0 -> 2850 bytes .../7.x/zeppelin/ssl-repo-client.keystore | Bin 0 -> 3265 bytes .../7.x/zeppelin/ssl-repo-client.truststore | Bin 0 -> 2850 bytes .../generators/app/templates/latest/.env | 14 + .../templates/latest/docker-compose-ce.yml | 206 +++++++++++ .../templates/latest/docker-compose-ee.yml | 345 ++++++++++++++++++ .../noRerank/conf/solrcore.properties | 4 +- .../templates/rerank/conf/solrcore.properties | 4 +- .../collection1/conf/solrcore.properties | 4 +- .../master/conf/solrcore.properties | 4 +- .../alfresco-solrclient-lib/pom.xml | 2 +- .../solr/client/SOLRAPIClientFactory.java | 72 ++-- .../src/main/resources/licenses/notice.txt | 16 +- 37 files changed, 692 insertions(+), 171 deletions(-) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/alfresco/keystore (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/alfresco/keystore-passwords.properties (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/alfresco/ssl-keystore-passwords.properties (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/alfresco/ssl-truststore-passwords.properties (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/alfresco/ssl.keystore (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/alfresco/ssl.truststore (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/client/browser.p12 (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/solr/ssl-keystore-passwords.properties (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/solr/ssl-truststore-passwords.properties (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/solr/ssl.repo.client.keystore (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/solr/ssl.repo.client.truststore (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/zeppelin/ssl.repo.client.keystore (100%) rename e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/{ => 6.x}/zeppelin/ssl.repo.client.truststore (100%) create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/keystore create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/ssl.keystore create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/ssl.truststore create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/client/browser.p12 create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/solr/ssl-repo-client.keystore create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/solr/ssl-repo-client.truststore create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.keystore create mode 100644 e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.truststore create mode 100755 e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/.env create mode 100755 e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/docker-compose-ce.yml create mode 100755 e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/docker-compose-ee.yml diff --git a/e2e-test/generator-alfresco-docker-compose/README.md b/e2e-test/generator-alfresco-docker-compose/README.md index 00a45e386..68c0ab08f 100644 --- a/e2e-test/generator-alfresco-docker-compose/README.md +++ b/e2e-test/generator-alfresco-docker-compose/README.md @@ -17,8 +17,10 @@ $ tree generators/app/templates/ │   ├── .env │   ├── docker-compose-ce.yml │   └── docker-compose-ee.yml -├── empty -│   └── empty +├── latest +│   ├── .env +│   ├── docker-compose-ce.yml +│   └── docker-compose-ee.yml├── empty ├── images │   ├── alfresco │   │   ├── Dockerfile @@ -42,7 +44,7 @@ $ tree generators/app/templates/ │   │   └── sharding-share-config-custom.xml │   └── zeppelin │   └── Dockerfile -└── keystores +└── keystores :: 6.x / 7.x ├── alfresco ├── client ├── solr @@ -50,8 +52,8 @@ $ tree generators/app/templates/ ``` * `.env` includes default values for Docker Compose environment variables -* `docker-compose-ce.yml` is the base Docker Compose Template for Alfresco Community deployment (for ACS 6.2 and ACS 6.1) -* `docker-compose-ee.yml` is the base Docker Compose Template for Alfresco Enterprise deployment (for ACS 6.2 and ACS 6.1) +* `docker-compose-ce.yml` is the base Docker Compose Template for Alfresco Community deployment (for latest, ACS 6.2 and ACS 6.1) +* `docker-compose-ee.yml` is the base Docker Compose Template for Alfresco Enterprise deployment (for latest, ACS 6.2 and ACS 6.1) * `alfresco` includes a Dockerfile template to start Alfresco Repository * `model` includes a default content model (Sharding Explicit Routing or empty). This `empty` file is required for Dockerfile to work, so it should not be deleted. * `share` includes a Dockerfile template to start Share Web Application @@ -59,7 +61,7 @@ $ tree generators/app/templates/ * `search` includes a Dockerfile template to start Search Services and Insight Engine * `config` includes configuration for HTTP Web Proxy (NGINX) * `zeppelin` includes a Dockerfile template to start Zeppelin with SSL -* `keystores` includes every truststore and keystore required for SSL configuration +* `keystores` includes every truststore and keystore required for SSL configuration. Included different stores for ACS 6.x and ACS 7.x, as there were changes between this versions ## Installation @@ -80,15 +82,17 @@ $ yo alfresco-docker-compose ## ACS Version -Currently supported ACS Versions are `6.2` and `6.1` +Currently supported ACS Versions are `latest`, `6.2` and `6.1` This is the first choice to be selected when the generator is executed. ``` ? Which ACS version do you want to use? 6.1 -❯ 6.2 + 6.2 +❯ latest ``` + ## AGS Version Currently supported AGS Version is `latest` (based in ACS 6.1). @@ -197,7 +201,7 @@ $ yo alfresco-docker-compose --acsVersion=6.2 --alfrescoVersion=community --http **Parameter names reference** -`--acsVersion`: default 6.2, but could be set to 6.1 +`--acsVersion`: default latest, but could be set to 6.2 or 6.1 `--ags:`: only available when acsVersion=6.1 `--alfrescoVersion`: community or enterprise `--httpMode`: http or https 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 2058411fc..568bcffbd 100644 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js @@ -21,8 +21,8 @@ module.exports = class extends Generator { type: 'list', name: 'acsVersion', message: 'Which ACS version do you want to use?', - choices: [ "6.1", "6.2" ], - default: '6.2' + choices: [ '6.1', '6.2', 'latest' ], + default: 'latest' }, { whenFunction: response => response.acsVersion == '6.1', @@ -143,10 +143,8 @@ module.exports = class extends Generator { // Generate boilerplate from "templates" folder writing() { - var dockerComposeTemplateDirectory = '6.2'; - if (this.props.acsVersion.startsWith('6.1')) { - dockerComposeTemplateDirectory = '6.1'; - } + // Set base template directory: 6.1, 6.2, latest + var dockerComposeTemplateDirectory = this.props.acsVersion; // Docker Compose environment variables values this.fs.copyTpl( @@ -181,10 +179,10 @@ module.exports = class extends Generator { (this.props.alfrescoVersion == 'community' ? (this.props.ags ? 'alfresco/alfresco-governance-share-community' : - 'alfresco/alfresco-share') : + 'quay.io/alfresco/alfresco-share') : (this.props.ags ? 'quay.io/alfresco/alfresco-governance-share-enterprise': - 'alfresco/alfresco-share' + 'quay.io/alfresco/alfresco-share' ) ); @@ -297,21 +295,23 @@ module.exports = class extends Generator { // Add resources for SSL configuration if (this.props.httpMode == 'https') { + // Currently Community 'latest' only supports OLD keystores and trustores format + var subfolder = (this.props.acsVersion == 'latest' && this.props.alfrescoVersion == 'enterprise') ? '7.x' : '6.x' this.fs.copy( - this.templatePath('keystores/alfresco'), + this.templatePath('keystores/' + subfolder + '/alfresco'), this.destinationPath('keystores/alfresco') ) this.fs.copy( - this.templatePath('keystores/solr'), + this.templatePath('keystores/' + subfolder + '/solr'), this.destinationPath('keystores/solr') ) this.fs.copy( - this.templatePath('keystores/client'), + this.templatePath('keystores/' + subfolder + '/client'), this.destinationPath('keystores/client') ) if (this.props.zeppelin == true) { this.fs.copy( - this.templatePath('keystores/zeppelin'), + this.templatePath('keystores/' + subfolder + '/zeppelin'), this.destinationPath('keystores/zeppelin') ) } diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/.env b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/.env index 352f5b342..af5ab5ebb 100755 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/.env +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/.env @@ -1,15 +1,13 @@ -ALFRESCO_TAG=latest -SHARE_TAG=6.2.0 +ALFRESCO_TAG=6.2.1 +ALFRESCO_CE_TAG=6.2.0-ga +SHARE_TAG=6.2.1 POSTGRES_TAG=11.4 -TRANSFORM_ROUTER_TAG=1.1.0 -PDF_RENDERER_TAG=2.1.0 -IMAGE_MAGICK_TAG=2.1.0 -LIBREOFFICE_TAG=2.1.0 -TIKA_TAG=2.1.0 -TRANSFORM_MISC_TAG=2.1.0 -SHARED_FILE_STORE_TAG=0.5.3 +TRANSFORM_ROUTER_TAG=1.2.0 +TRANSFORM_CORE_AIO_TAG=2.2.1 +TRANSFORMER_TAG=2.1.0 +SHARED_FILE_STORE_TAG=0.7.0 ACTIVE_MQ_TAG=5.15.8 -DIGITAL_WORKSPACE_TAG=1.3.0 +DIGITAL_WORKSPACE_TAG=1.5.0 ACS_NGINX_TAG=3.0.1 ACS_COMMUNITY_NGINX_TAG=1.0.0 SEARCH_TAG=latest diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml index c6f466991..0773340eb 100755 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml @@ -7,7 +7,7 @@ services: build: context: ./alfresco args: - ALFRESCO_TAG: ${ALFRESCO_TAG} + ALFRESCO_TAG: ${ALFRESCO_CE_TAG} SOLR_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_PASS: kT9X6oe68t @@ -141,7 +141,7 @@ services: <% } %> alfresco-pdf-renderer: - image: alfresco/alfresco-pdf-renderer:${PDF_RENDERER_TAG} + image: alfresco/alfresco-pdf-renderer:${TRANSFORMER_TAG} mem_limit: 1g environment: JAVA_OPTS: " -Xms256m -Xmx512m" @@ -149,7 +149,7 @@ services: - 8090:8090 imagemagick: - image: alfresco/alfresco-imagemagick:${IMAGE_MAGICK_TAG} + image: alfresco/alfresco-imagemagick:${TRANSFORMER_TAG} mem_limit: 1g environment: JAVA_OPTS: " -Xms256m -Xmx512m" @@ -157,7 +157,7 @@ services: - 8091:8090 libreoffice: - image: alfresco/alfresco-libreoffice:${LIBREOFFICE_TAG} + image: alfresco/alfresco-libreoffice:${TRANSFORMER_TAG} mem_limit: 1g environment: JAVA_OPTS: " -Xms256m -Xmx512m" @@ -165,7 +165,7 @@ services: - 8092:8090 tika: - image: alfresco/alfresco-tika:${TIKA_TAG} + image: alfresco/alfresco-tika:${TRANSFORMER_TAG} mem_limit: 1g environment: JAVA_OPTS: " -Xms256m -Xmx512m" @@ -173,7 +173,7 @@ services: - 8093:8090 transform-misc: - image: alfresco/alfresco-transform-misc:${TRANSFORM_MISC_TAG} + image: alfresco/alfresco-transform-misc:${TRANSFORMER_TAG} mem_limit: 1g environment: JAVA_OPTS: " -Xms256m -Xmx512m" diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml index 407049ddb..851bb4129 100755 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml @@ -33,20 +33,12 @@ services: -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ - - -Dlocal.transform.service.enabled=true - -DlocalTransform.pdfrenderer.url=http://alfresco-pdf-renderer:8090/ - -DlocalTransform.imagemagick.url=http://imagemagick:8090/ - -DlocalTransform.libreoffice.url=http://libreoffice:8090/ - -DlocalTransform.tika.url=http://tika:8090/ - -DlocalTransform.misc.url=http://transform-misc:8090/ - - -Dlegacy.transform.service.enabled=true - -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/ - -Djodconverter.url=http://libreoffice:8090/ - -Dimg.url=http://imagemagick:8090/ - -Dtika.url=http://tika:8090/ - -Dtransform.misc.url=http://transform-misc:8090/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true @@ -204,75 +196,24 @@ services: environment: JAVA_OPTS: " -Xms256m -Xmx512m" ACTIVEMQ_URL: "nio://activemq:61616" - IMAGEMAGICK_URL: "http://imagemagick:8090" - PDF_RENDERER_URL : "http://alfresco-pdf-renderer:8090" - LIBREOFFICE_URL : "http://libreoffice:8090" - TIKA_URL : "http://tika:8090" + CORE_AIO_URL : "http://transform-core-aio:8090" FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" ports: - 8095:8095 links: - activemq - alfresco-pdf-renderer: - image: alfresco/alfresco-pdf-renderer:${PDF_RENDERER_TAG} - mem_limit: 1g + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:${TRANSFORM_CORE_AIO_TAG} + mem_limit: 1536m environment: - JAVA_OPTS: " -Xms256m -Xmx512m" + JAVA_OPTS: " -Xms256m -Xmx1536m" ACTIVEMQ_URL: "nio://activemq:61616" FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" ports: - 8090:8090 links: - - activemq - - imagemagick: - image: alfresco/alfresco-imagemagick:${IMAGE_MAGICK_TAG} - mem_limit: 1g - environment: - JAVA_OPTS: " -Xms256m -Xmx512m" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8091:8090 - links: - - activemq - - libreoffice: - image: alfresco/alfresco-libreoffice:${LIBREOFFICE_TAG} - mem_limit: 1g - environment: - JAVA_OPTS: " -Xms256m -Xmx512m" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8092:8090 - links: - - activemq - - tika: - image: alfresco/alfresco-tika:${TIKA_TAG} - mem_limit: 1g - environment: - JAVA_OPTS: " -Xms256m -Xmx512m" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8093:8090 - links: - - activemq - - transform-misc: - image: alfresco/alfresco-transform-misc:${TRANSFORM_MISC_TAG} - mem_limit: 1g - environment: - JAVA_OPTS: " -Xms256m -Xmx512m" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8094:8090 - links: - - activemq + - activemq shared-file-store: image: alfresco/alfresco-shared-file-store:${SHARED_FILE_STORE_TAG} @@ -317,7 +258,7 @@ services: activemq: image: alfresco/alfresco-activemq:${ACTIVE_MQ_TAG} - mem_limit: 512m + mem_limit: 1g ports: - 8161:8161 # Web Console - 5672:5672 # AMQP diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/search/Dockerfile b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/search/Dockerfile index 0ff7861ba..cac554a1c 100755 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/search/Dockerfile +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/search/Dockerfile @@ -32,16 +32,31 @@ ENV TRUSTSTORE_TYPE $TRUSTSTORE_TYPE ARG KEYSTORE_TYPE ENV KEYSTORE_TYPE $KEYSTORE_TYPE +# Passwords using Env Vars +ARG PASSWORDS_AS_ENV_VARS +ENV PASSWORDS_AS_ENV_VARS $PASSWORDS_AS_ENV_VARS + # Set SSL properties RUN if [ "$ALFRESCO_COMMS" == "https" ] ; then \ - sed -i '/^bash.*/i \ - sed -i "'"s/alfresco.encryption.ssl.keystore.location=.*/alfresco.encryption.ssl.keystore.location=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl.repo.client.keystore/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ - sed -i "'"s/alfresco.encryption.ssl.keystore.passwordFileLocation=.*/alfresco.encryption.ssl.keystore.passwordFileLocation=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl-keystore-passwords.properties/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ - sed -i "'"s/alfresco.encryption.ssl.keystore.type=.*/alfresco.encryption.ssl.keystore.type=${KEYSTORE_TYPE}/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ - sed -i "'"s/alfresco.encryption.ssl.truststore.location=.*/alfresco.encryption.ssl.truststore.location=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl.repo.client.truststore/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ - sed -i "'"s/alfresco.encryption.ssl.truststore.passwordFileLocation=.*/alfresco.encryption.ssl.truststore.passwordFileLocation=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl-truststore-passwords.properties/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ - sed -i "'"s/alfresco.encryption.ssl.truststore.type=.*/alfresco.encryption.ssl.truststore.type=${TRUSTSTORE_TYPE}/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties' \ - ${DIST_DIR}/solr/bin/search_config_setup.sh; \ + if [ "$PASSWORDS_AS_ENV_VARS" == "true" ]; then \ + sed -i '/^bash.*/i \ + sed -i "'"s/alfresco.encryption.ssl.keystore.location=.*/alfresco.encryption.ssl.keystore.location=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl-repo-client.keystore/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.keystore.passwordFileLocation=.*/alfresco.encryption.ssl.keystore.passwordFileLocation=/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.keystore.type=.*/alfresco.encryption.ssl.keystore.type=${KEYSTORE_TYPE}/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.truststore.location=.*/alfresco.encryption.ssl.truststore.location=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl-repo-client.truststore/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.truststore.passwordFileLocation=.*/alfresco.encryption.ssl.truststore.passwordFileLocation=/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.truststore.type=.*/alfresco.encryption.ssl.truststore.type=${TRUSTSTORE_TYPE}/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties' \ + ${DIST_DIR}/solr/bin/search_config_setup.sh; \ + else \ + sed -i '/^bash.*/i \ + sed -i "'"s/alfresco.encryption.ssl.keystore.location=.*/alfresco.encryption.ssl.keystore.location=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl.repo.client.keystore/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.keystore.passwordFileLocation=.*/alfresco.encryption.ssl.keystore.passwordFileLocation=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl-keystore-passwords.properties/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.keystore.type=.*/alfresco.encryption.ssl.keystore.type=${KEYSTORE_TYPE}/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.truststore.location=.*/alfresco.encryption.ssl.truststore.location=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl.repo.client.truststore/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.truststore.passwordFileLocation=.*/alfresco.encryption.ssl.truststore.passwordFileLocation=\\\/opt\\\/<%=searchPath%>\\\/keystore\\\/ssl-truststore-passwords.properties/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties && \ + sed -i "'"s/alfresco.encryption.ssl.truststore.type=.*/alfresco.encryption.ssl.truststore.type=${TRUSTSTORE_TYPE}/g"'" ${DIST_DIR}/solrhome/templates/rerank/conf/solrcore.properties' \ + ${DIST_DIR}/solr/bin/search_config_setup.sh; \ + fi \ fi # REPLICATION diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/keystore similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/keystore diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/keystore-passwords.properties similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/keystore-passwords.properties rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/keystore-passwords.properties diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-keystore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl-keystore-passwords.properties similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-keystore-passwords.properties rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl-keystore-passwords.properties diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-truststore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl-truststore-passwords.properties similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl-truststore-passwords.properties rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl-truststore-passwords.properties diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl.keystore similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.keystore rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl.keystore diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl.truststore similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/alfresco/ssl.truststore rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/alfresco/ssl.truststore diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/client/browser.p12 b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/client/browser.p12 similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/client/browser.p12 rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/client/browser.p12 diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-keystore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl-keystore-passwords.properties similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-keystore-passwords.properties rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl-keystore-passwords.properties diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-truststore-passwords.properties b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl-truststore-passwords.properties similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl-truststore-passwords.properties rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl-truststore-passwords.properties diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl.repo.client.keystore similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.keystore rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl.repo.client.keystore diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl.repo.client.truststore similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/solr/ssl.repo.client.truststore rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/solr/ssl.repo.client.truststore diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/zeppelin/ssl.repo.client.keystore similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.keystore rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/zeppelin/ssl.repo.client.keystore diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/zeppelin/ssl.repo.client.truststore similarity index 100% rename from e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/zeppelin/ssl.repo.client.truststore rename to e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/6.x/zeppelin/ssl.repo.client.truststore diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/keystore new file mode 100644 index 0000000000000000000000000000000000000000..680c281b2b40984b16ab562545ad9106210ea4ba GIT binary patch literal 327 zcmXqLVsvI=WHxC0%f_kI=F#?@myw-uLF0Rt#y19yFAW->p$Ok#X}oICc*&sgJR3Ju zH4hgf>w+qS3S#X_OR;8-jBRAHN~B?dBbZ)dZm-{&fCm68AUZH-IZo}1#c&-iVe_I~MP#Zy;i zUpU(C`!2FIbNT1eABHXl@^CkDiWmyX2{7a`q%xE+Br>D`F_1P;L?{q76k!nx$;?ev zFf_F^HZ`y`Ff}wbF)^?+P&D9VW7XzkW|CrMU=f*T_2x>;gbAWMHg{ZDcQW&`F5?;# g7LiIxgD=b$d%m`bZYzuWr;__jShS9bnXzpF0F~cxBme*a literal 0 HcmV?d00001 diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/ssl.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/ssl.keystore new file mode 100644 index 0000000000000000000000000000000000000000..8e9732d80079bbd0a999ae3efbabec94be5ba0fb GIT binary patch literal 3255 zcmX?i?%X*B1_mZ5W@O+fF3!;_N-fA|U|=j}>8kVxN-i^KVp?P%!^Wx2#>m2`#U#vV zz|X=_<+i<{`-7w+6Eicf14|QAL!{}}w~r^y|5APAJg4e?%Up?PDa>uP0bh3h7AsEb z%Rj9Y^YO+SpG6(U$(uKZ`FykbWO3@UXyNA@EF4X9v~GWyv+A!%lxEgbI#8&|&0jGH}IS1dd>v+Mxx{F5rTY!AeGCfEpatP`)f+M?6o zrJJW-GhuQJTVYn*k-j66VV2Eye@?KSx;6R5%ILYP{#*(!INp(T|Jtm#0aNc4YV$s> zdM(LNbZye7J5|SKM7czHTg|DA$ldJj8z+<@6YacKa@JEPfijC1Yzj-og^sJR6?(q* zk++tdmGLHFN4VS?BefR3FLfe|L~dK|uK23ZZCta&soU&ufxP9-S21h z`d@E6aW-?y)XQado_%|yo$hS1+q_3ljz2aKNTL+gnF{V|ya9{6b_DHL~W}~Uu zaHZpO?)?WT;yk|sCO6a;+U{navi$rk`Se>GRkzGe6N#THazZ9MZ(*e7;{z&Q^VgTR zF$IQpEAaYXUu@kL)cF4cpYyUi7Mn$H)~)*&eCC!@;kV<~VZY7Vl{P*IE8VlnaFM~D zCv!J1-je(Dr=Z{D$MTnrrngO7#i-+-w7Vtfic9GHRSb)^iB{AIM#?=o%Xz4EUdNR9 zqj!5NK8K}UR80QX?--)V{j8%&@6(g1em6z!avUZL9de!)YV|tplC<8m*=)D6I%*{( zjZU;I|MT2-Yy3TlaQ?eTc7xL}YlNPufh7Y2^HqZ;=8HgVwSbw4k%@^(fWd&5jZ>@5 zqwPB{BO^B}gF(F^w*e;`b0`a&Fq69zjKjgh6zXj#Y#<1dVdvrUP0UP5&C5tlOfi%< zkOc{H@rXI*q!pzWC+8~!=ckpFCl;kD_>`pR844KiffR7_u!rVl=jE5@8A=;Sf<%~k zgq%x@OY(CS;5wZh4dldmjSLLTj13GdjZ6$IqQrTDOfw@3DA%9}<|Zr-B*QJr28s~3 zNTItW2$BD+6<5FM~m2CsSi1!?`Vn{c8&&ep+~aG*3!oX_+QD zCCBsFpYs{=n`Q`2-tuI66kF0>Hqq;+xQ>Me8qQ|$@m>1&$0_Xxk9W0M+Rc5XSzNOD z1hd4?%VvwD7z1O}KE6Ku_aEbV3rVZyQ~`yEoAJ_?3q@qia_0X?6kXnYO)WCr#E$iC z*5?0Qm&|<4N(wJBF*7nSE^cB>H)vu^21lK&Fbk6b12C>Q6WTl&+kQAPGP1BRGqE`s z7$byuS=7W-{0ma^f`fe&+*9*XixNvxQxt+zi^@`q6r59wN;1L=g6+9cy zpU+;>uxDXo%aX>%0Z&>@oD5Scj8y!VvTK8rq%1!p<9|@dur4qV26;l2g~x!4jRRPq zv$C=?Ga8711O-`m4Y->)bMliDb29RaOOR6nFvBndlYsf_PYHjlO>(cEzGQBu)0+JL z`BY^SH~(ZEi|$g(a~m!&OkyavsWgA6daZBOch|V2`qnl{%{_DXaq`@L$+DOKOtIm5 zmbsf}FZ|rVrumDT*O4{U1J_&Mph zZZi&HqXa7-0FE=>f1(x&y?nko=A0;lZEHO+eWkSWJO){eUMHym@|$^zMJh z4tJdBi=Eb|>l|^YYO?bs(|?!l@#wTnFc!RLHDwXM#G>Fw`Dl+fuou;PCGD&Lp{$CB-vU-b3 zVKra|<^|MT!Ptf+sVlv1)PMJP$C`+96P5X`g;=)eruUt5n}u$Jxd*~eA9*-S2p{k%bK!WI+J>D z{{J5a_ZlaBXJ@qBGL6HdC}>`OC%8J}2Q|kM zp|y=(aw4QvR&`-CAJCva##i@^=7WLC2Ud^S+Z4Fjr#tUDzw?T?-Sb20^X~!xiY941 literal 0 HcmV?d00001 diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/ssl.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/alfresco/ssl.truststore new file mode 100644 index 0000000000000000000000000000000000000000..661fadd7b58fc23291559237e9d71fbeeffe71a4 GIT binary patch literal 1832 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 L8#!EFD<%K{QF(tC literal 0 HcmV?d00001 diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/solr/ssl-repo-client.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/solr/ssl-repo-client.truststore new file mode 100644 index 0000000000000000000000000000000000000000..fd5a9dd615d9d1edcb2cba91df94d6b995f458d4 GIT binary patch literal 2850 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 L8#!EFD<%K{QF(tC literal 0 HcmV?d00001 diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.truststore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.truststore new file mode 100644 index 0000000000000000000000000000000000000000..fd5a9dd615d9d1edcb2cba91df94d6b995f458d4 GIT binary patch literal 2850 zcmX?i?%X*B1_mY|W(L#z#l<vVQBkQ3)MGB7YRHZZU>GBL1-66Xan z&5SIdT!TuOo3J>L47X?*Xh7Vei0+mkU_cgUmgE;zDma6K)1Yxaa%eHKGB7vxG8i;= zGBq|bEb2V}znA-)d)eQ#=&##usLhYuXd7YqtJWfpD={wS?$dxnGQ2ZytKIu#t>zwc zvFqEzr7Ul160Egi9@kA*i?n)s-7E9JJoo4Y%qhj1rUeDhrIu`uI=Yl2X!i4|MRmMO ze7Ci>JU{AF^QUw2y^f#9X9vkgPG#w|nzr-Vf|rl4a9Fi7F*7nSE^cB>H)vu^2FIYR zFbk6b12D=s6WTl&+kQAPGP1BRGqE`s7$byuS=7W-{0ma^f`fe&+*9*XixNvxQxt+z zi^@`q6r59wN;1{-~@vZS$bz*ATgC&QEqBNe};?AqXz zDa+5u_#YH9tP2c;L7q@$;W6N1USlu3yVvaZ>Tks`<5kmF*(iulBzTb@jhVoTb~CVKr8*Rjw*!`TczzDxi9IHmpI@vb&YyScA4 zi%T}2V3zoK*=&&%V_=Nh$JdAd{$o6EA!*f|DxeT?GhW(qp@@uG&io&VqRX4FsYRxn z*s;FN+WepEl9{hrN#R9$=6c?Yw;xi}7s)w&{eLI);IWT#8=FUSeItYU>rV-PtW9#S zp1x#mrqi1I{`pj86F2{49gFT#%X1qpFic`7x2ZILsCun$)pyspr25u2NzFZT_i^&v ze#x?z|4gyrdX~AHXD|HRz^43G{@I^hLCMU?{j=MTJZlV?sT905$5b}Rh9^^e{*~4I zuMcc$*Z4W+_to@l>A(^Fo025FH0N8*5w+9Bkkiypt*do3A-?76TC;DQi_31iC9IBe^e983RrF%R&Efb6d z?^#V*#4oWZ_|ZP*_SC}utM)S2pX&Lm?W;J&?#1<{#^L?qo^vOqKVL z0wKX54ynGzRu>z{L#k^D12OECwE+)EfiMfJ0W+|AM6D5h#-yLfr z&P`P2o8BR}VS%c;U)nCgs7K#dOp^$lzW?H{gzt5yFC5?VL}Z!ERHFkkTz_pndcj({ zPxx7P{ksa8i_t9lt?^A8Zd}>ylP+t@a_LO!z4`xt7~E@|@SUB}a?3OhkD{P?y)u$A w^E2+P*n0i;2l1lSJ+(qo`m#cdHJxXFTDE^zxVtj <% if (httpMode == 'https') { %> + TRUSTSTORE_TYPE: JCEKS + TRUSTSTORE_PASS: kT9X6oe68t + KEYSTORE_TYPE: JCEKS + KEYSTORE_PASS: kT9X6oe68t <% } %> + COMPRESS_CONTENT: "<%=gzip%>" + mem_limit: 1800m + environment: + JAVA_OPTS : " + -Ddb.driver=org.postgresql.Driver + -Ddb.username=alfresco + -Ddb.password=alfresco + -Ddb.url=jdbc:postgresql://postgres:5432/alfresco + -Dsolr.host=<%=searchSolrHost%> + -Dsolr.port.ssl=8983 + -Dsolr.secureComms=<%=secureComms%> + -Dsolr.baseUrl=/solr + -Dindex.subsystem.name=solr6 + -Dshare.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ + + -Dcsrf.filter.enabled=false + -Dalfresco.restApi.basicAuthScheme=true + -Xms1500m -Xmx1500m + " <% if (httpMode == 'https') { %> + ports: + - 8443:8443 + volumes: + - ./keystores/alfresco:/usr/local/tomcat/alf_data/keystore <% } %> + + solr6: + build: + context: ./search + args: + SEARCH_TAG: ${SEARCH_TAG} + SOLR_HOSTNAME: solr6 + ALFRESCO_HOSTNAME: alfresco + ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> + TRUSTSTORE_TYPE: JCEKS + KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %> + ENABLE_MASTER: "true" + ENABLE_SLAVE: "false" <% } %> + COMPRESS_CONTENT: "<%=gzip%>" + mem_limit: 1200m + environment: + #Solr needs to know how to register itself with Alfresco + SOLR_ALFRESCO_HOST: "alfresco" + SOLR_ALFRESCO_PORT: "<%=alfrescoPort%>" + ALFRESCO_SECURE_COMMS: <%=secureComms%> + #Alfresco needs to know how to call solr + SOLR_SOLR_HOST: "solr6" + SOLR_SOLR_PORT: "8983" + #Create the default alfresco and archive cores + SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive" + SOLR_JAVA_MEM: "-Xms1g -Xmx1g" <% 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_OPTS: " + -Dsolr.ssl.checkPeerName=false + -Dsolr.allow.unsafe.resourceloading=true + " <% } %> + ports: + - 8083:8983 <% if (httpMode == 'https') { %> + volumes: + - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> + + <% if (replication) { %> + solr6secondary: + build: + context: ./search + args: + SEARCH_TAG: ${SEARCH_TAG} + SOLR_HOSTNAME: solr6secondary + ALFRESCO_HOSTNAME: alfresco + ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> + TRUSTSTORE_TYPE: JCEKS + KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %> + ENABLE_MASTER: <% if (replication == 'master-master') { %>"true"<% } else { %>"false"<% } %> + ENABLE_SLAVE: <% if (replication == 'master-master') { %>"false"<% } else { %>"true"<% } %> + MASTER_HOST: solr6 <% } %> + COMPRESS_CONTENT: "<%=gzip%>" + mem_limit: 1200m + environment: + #Solr needs to know how to register itself with Alfresco + SOLR_ALFRESCO_HOST: "alfresco" + SOLR_ALFRESCO_PORT: "<%=alfrescoPort%>" + ALFRESCO_SECURE_COMMS: <%=secureComms%> + #Alfresco needs to know how to call solr + SOLR_SOLR_HOST: "solr6secondary" + SOLR_SOLR_PORT: "8983" + #Create the default alfresco and archive cores + SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive" + SOLR_JAVA_MEM: "-Xms1g -Xmx1g" <% 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_OPTS: " + -Dsolr.ssl.checkPeerName=false + -Dsolr.allow.unsafe.resourceloading=true + " <% } %> + ports: + - 8084:8983 <% if (httpMode == 'https') { %> + volumes: + - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> + <% } %> + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:${TRANSFORM_CORE_AIO_TAG} + mem_limit: 1536m + environment: + JAVA_OPTS: " -Xms256m -Xmx1536m" + ports: + - 8090:8090 + + share: + build: + context: ./share + args: + SHARE_TAG: ${SHARE_TAG} + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -Xms500m + -Xmx500m + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + + postgres: + image: postgres:${POSTGRES_TAG} + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - 5432:5432 + + activemq: + image: alfresco/alfresco-activemq:${ACTIVE_MQ_TAG} + mem_limit: 1g + ports: + - 8161:8161 # Web Console + - 5672:5672 # AMQP + - 61616:61616 # OpenWire + - 61613:61613 # STOMP + + content-app: + image: alfresco/alfresco-content-app:${ACA_TAG} + mem_limit: 256m + depends_on: + - alfresco + + # HTTP proxy to provide HTTP Default port access to services + # SOLR API and SOLR Web Console are protected to avoid unauthenticated access + proxy: + image: nginx:stable-alpine + mem_limit: 128m + depends_on: + - alfresco + volumes: + - ./config/nginx.conf:/etc/nginx/nginx.conf + - ./config/nginx.htpasswd:/etc/nginx/conf.d/nginx.htpasswd <% if (httpWebMode == 'https') { %> + - ./config/cert/localhost.cer:/etc/nginx/localhost.cer + - ./config/cert/localhost.key:/etc/nginx/localhost.key <% } %> + ports: + - <%=port%>:<%=port%> + links: + - alfresco + - share + - solr6 + - content-app \ No newline at end of file diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/docker-compose-ee.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/docker-compose-ee.yml new file mode 100755 index 000000000..0157513d3 --- /dev/null +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/docker-compose-ee.yml @@ -0,0 +1,345 @@ +# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose +version: "2" + +services: + alfresco: + build: + context: ./alfresco + args: + ALFRESCO_TAG: ${ALFRESCO_TAG} + SOLR_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> + TRUSTSTORE_TYPE: JCEKS + TRUSTSTORE_PASS: kT9X6oe68t + KEYSTORE_TYPE: JCEKS + KEYSTORE_PASS: kT9X6oe68t <% } %> + COMPRESS_CONTENT: "<%=gzip%>" + mem_limit: 1800m + environment: + JAVA_TOOL_OPTIONS: " + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=mp6yc0UD9e + -Dmetadata-keystore.metadata.algorithm=AES + <% if (httpMode == 'https') { %> + -Dencryption.keystore.type=pkcs12 + -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=AES + -Dssl-keystore.password=kT9X6oe68t + -Dssl-keystore.aliases=ssl-alfresco-ca,ssl-repo + -Dssl-keystore.ssl-alfresco-ca.password=kT9X6oe68t + -Dssl-keystore.ssl-repo.password=kT9X6oe68t + -Dssl-truststore.password=kT9X6oe68t + -Dssl-truststore.aliases=alfresco-ca,ssl-repo-client + -Dssl-truststore.alfresco-ca.password=kT9X6oe68t + -Dssl-truststore.ssl-repo-client.password=kT9X6oe68t <% } %> + " + JAVA_OPTS: " + -Ddb.driver=org.postgresql.Driver + -Ddb.username=alfresco + -Ddb.password=alfresco + -Ddb.url=jdbc:postgresql://postgres:5432/alfresco + -Dsolr.host=<%=searchSolrHost%> + -Dsolr.port.ssl=8983 + -Dsolr.secureComms=<%=secureComms%> + -Dsolr.baseUrl=/solr <% if (sharding == 'true') { %> + -Dsolr.useDynamicShardRegistration=true <% } %> + -Dindex.subsystem.name=solr6 + + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + + -Dtransform.service.enabled=true + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ + + -Dcsrf.filter.enabled=false + -Dalfresco.restApi.basicAuthScheme=true + -Xms1500m -Xmx1500m + " <% if (httpMode == 'https') { %> + ports: + - 8443:8443 + volumes: + - ./keystores/alfresco:/usr/local/tomcat/alf_data/keystore <% } %> + + solr6: + build: + context: ./search + args: + SEARCH_TAG: ${SEARCH_TAG} + SOLR_HOSTNAME: solr6 + ALFRESCO_HOSTNAME: alfresco + ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> + TRUSTSTORE_TYPE: JCEKS + KEYSTORE_TYPE: JCEKS + PASSWORDS_AS_ENV_VARS: "true" <% } %> <% if (replication) { %> + ENABLE_MASTER: "true" + ENABLE_SLAVE: "false" <% } %> <% if (sharding == 'true') { %> + ENABLE_SHARDING: "true" + NUM_SHARDS: "2" + SHARD_ID: "0" <% if (shardingMethod == 'DB_ID_RANGE') { %> + SHARD_RANGE: "0-800" <% } %> <% if (shardingMethod == 'DATE') { %> + SHARD_KEY: "cm:created" + SHARD_DATE_GROUPING: "2" <% } %> <% if (shardingMethod == 'PROPERTY') { %> + SHARD_KEY: "shard:shardId" <% } %> <% if (shardingMethod == 'EXPLICIT_ID' || shardingMethod == 'EXPLICIT_ID_FALLBACK_LRIS') { %> + SHARD_KEY: "shard:shardId" <% } %> + SHARDING_METHOD: <%=shardingMethod%> <% } %> + COMPRESS_CONTENT: "<%=gzip%>" + mem_limit: 1200m + environment: + #Solr needs to know how to register itself with Alfresco + SOLR_ALFRESCO_HOST: "alfresco" + SOLR_ALFRESCO_PORT: "<%=alfrescoPort%>" + ALFRESCO_SECURE_COMMS: <%=secureComms%> + #Alfresco needs to know how to call solr + SOLR_SOLR_HOST: "solr6" + SOLR_SOLR_PORT: "8983" + #Create the default alfresco and archive cores + SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive" + SOLR_JAVA_MEM: "-Xms1g -Xmx1g" <% if (httpMode == 'https') { %> + SOLR_SSL_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.truststore" + SOLR_SSL_TRUST_STORE_TYPE: "JCEKS" + SOLR_SSL_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.keystore" + SOLR_SSL_KEY_STORE_TYPE: "JCEKS" + SOLR_SSL_NEED_CLIENT_AUTH: "true" <% if (sharding == 'true') { %> + SOLR_SSL_CLIENT_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.keystore" + SOLR_SSL_CLIENT_KEY_STORE_TYPE: "JCEKS" + SOLR_SSL_CLIENT_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.keystore" + SOLR_SSL_CLIENT_TRUST_STORE_TYPE: "JCEKS" <% } %> + JAVA_TOOL_OPTIONS: " + -Dsolr.jetty.truststore.password=kT9X6oe68t + -Dsolr.jetty.keystore.password=kT9X6oe68t <% if (sharding == 'true') { %> + -Djavax.net.ssl.keyStorePassword=kT9X6oe68t + -Djavax.net.ssl.trustStorePassword=kT9X6oe68t <% } %> + -Dssl-keystore.password=kT9X6oe68t + -Dssl-keystore.aliases=ssl-alfresco-ca,ssl-repo-client + -Dssl-keystore.ssl-alfresco-ca.password=kT9X6oe68t + -Dssl-keystore.ssl-repo-client.password=kT9X6oe68t + -Dssl-truststore.password=kT9X6oe68t + -Dssl-truststore.aliases=ssl-alfresco-ca,ssl-repo,ssl-repo-client + -Dssl-truststore.ssl-alfresco-ca.password=kT9X6oe68t + -Dssl-truststore.ssl-repo.password=kT9X6oe68t + -Dssl-truststore.ssl-repo-client.password=kT9X6oe68t + " + SOLR_OPTS: " + -Dsolr.ssl.checkPeerName=false + -Dsolr.allow.unsafe.resourceloading=true + " <% } %> + ports: + - 8083:8983 <% if (httpMode == 'https') { %> + volumes: + - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> + + <% if (sharding == 'true' || replication) { %> + solr6secondary: + build: + context: ./search + args: + SEARCH_TAG: ${SEARCH_TAG} + SOLR_HOSTNAME: solr6secondary + ALFRESCO_HOSTNAME: alfresco + ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> + TRUSTSTORE_TYPE: JCEKS + KEYSTORE_TYPE: JCEKS + PASSWORDS_AS_ENV_VARS: "true" <% } %> <% if (replication) { %> + ENABLE_MASTER: <% if (replication == 'master-master') { %>"true"<% } else { %>"false"<% } %> + ENABLE_SLAVE: <% if (replication == 'master-master') { %>"false"<% } else { %>"true"<% } %> + MASTER_HOST: solr6 <% } %> <% if (sharding == 'true') { %> + ENABLE_SHARDING: "true" + NUM_SHARDS: "2" + SHARD_ID: "1" <% if (shardingMethod == 'DB_ID_RANGE') { %> + SHARD_RANGE: "801-40000" <% } %> <% if (shardingMethod == 'DATE') { %> + SHARD_KEY: "cm:created" + SHARD_DATE_GROUPING: "2" <% } %> <% if (shardingMethod == 'PROPERTY') { %> + SHARD_KEY: "shard:shardId" <% } %> <% if (shardingMethod == 'EXPLICIT_ID' || shardingMethod == 'EXPLICIT_ID_FALLBACK_LRIS') { %> + SHARD_KEY: "shard:shardId" <% } %> + SHARDING_METHOD: <%=shardingMethod%> <% } %> + COMPRESS_CONTENT: "<%=gzip%>" + mem_limit: 1200m + environment: + #Solr needs to know how to register itself with Alfresco + SOLR_ALFRESCO_HOST: "alfresco" + SOLR_ALFRESCO_PORT: "<%=alfrescoPort%>" + ALFRESCO_SECURE_COMMS: <%=secureComms%> + #Alfresco needs to know how to call solr + SOLR_SOLR_HOST: "solr6secondary" + SOLR_SOLR_PORT: "8983" + #Create the default alfresco and archive cores + SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive" + SOLR_JAVA_MEM: "-Xms1g -Xmx1g" <% if (httpMode == 'https') { %> + SOLR_SSL_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.truststore" + SOLR_SSL_TRUST_STORE_TYPE: "JCEKS" + SOLR_SSL_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.keystore" + SOLR_SSL_KEY_STORE_TYPE: "JCEKS" + SOLR_SSL_NEED_CLIENT_AUTH: "true" <% if (sharding == 'true') { %> + SOLR_SSL_CLIENT_KEY_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.keystore" + SOLR_SSL_CLIENT_KEY_STORE_TYPE: "JCEKS" + SOLR_SSL_CLIENT_TRUST_STORE: "/opt/<%=searchPath%>/keystore/ssl-repo-client.keystore" + SOLR_SSL_CLIENT_TRUST_STORE_TYPE: "JCEKS" <% } %> + JAVA_TOOL_OPTIONS: " + -Dsolr.jetty.truststore.password=kT9X6oe68t + -Dsolr.jetty.keystore.password=kT9X6oe68t <% if (sharding == 'true') { %> + -Djavax.net.ssl.keyStorePassword=kT9X6oe68t + -Djavax.net.ssl.trustStorePassword=kT9X6oe68t <% } %> + -Dssl-keystore.password=kT9X6oe68t + -Dssl-keystore.aliases=ssl-alfresco-ca,ssl-repo-client + -Dssl-keystore.ssl-alfresco-ca.password=kT9X6oe68t + -Dssl-keystore.ssl-repo-client.password=kT9X6oe68t + -Dssl-truststore.password=kT9X6oe68t + -Dssl-truststore.aliases=ssl-alfresco-ca,ssl-repo,ssl-repo-client + -Dssl-truststore.ssl-alfresco-ca.password=kT9X6oe68t + -Dssl-truststore.ssl-repo.password=kT9X6oe68t + -Dssl-truststore.ssl-repo-client.password=kT9X6oe68t + " + SOLR_OPTS: " + -Dsolr.ssl.checkPeerName=false + -Dsolr.allow.unsafe.resourceloading=true + " <% } %> + ports: + - 8084:8983 <% if (httpMode == 'https') { %> + volumes: + - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> + <% } %> + + <% if (zeppelin == 'true') { %> + zeppelin: + build: + context: ./zeppelin + args: + ZEPPELIN_TAG: ${ZEPPELIN_TAG} + ALFRESCO_COMMS: <%=secureComms%> + mem_limit: 768m + environment: <% if (httpMode == 'https') { %> + REPO_PROTOCOL: "https" <% } %> + REPO_HOST: "alfresco" + REPO_PORT: "<%=alfrescoPort%>" <% if (httpMode == 'https') { %> + JAVA_TOOL_OPTIONS: " + -Djavax.net.ssl.keyStore=/zeppelin/keystore/ssl-repo-client.keystore + -Djavax.net.ssl.keyStorePassword=kT9X6oe68t + -Djavax.net.ssl.keyStoreType=JCEKS + -Djavax.net.ssl.trustStore=/zeppelin/keystore/ssl-repo-client.truststore + -Djavax.net.ssl.trustStorePassword=kT9X6oe68t + -Djavax.net.ssl.trustStoreType=JCEKS + " + JAVA_OPTS: " + -Dalfresco.enable.ssl=true + -Dsolr.ssl.checkPeerName=false + " <% } %> + ports: + - 9090:9090 <% if (httpMode == 'https') { %> + volumes: + - ./keystores/zeppelin:/zeppelin/keystore <% } %> + <% } %> + + transform-router: + mem_limit: 512m + image: quay.io/alfresco/alfresco-transform-router:${TRANSFORM_ROUTER_TAG} + environment: + JAVA_OPTS: " -Xms256m -Xmx512m" + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL : "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - 8095:8095 + links: + - activemq + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:${TRANSFORM_CORE_AIO_TAG} + mem_limit: 1536m + environment: + JAVA_OPTS: " -Xms256m -Xmx1536m" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - 8090:8090 + links: + - activemq + + shared-file-store: + image: alfresco/alfresco-shared-file-store:${SHARED_FILE_STORE_TAG} + mem_limit: 512m + environment: + JAVA_OPTS: " -Xms256m -Xmx512m" + scheduler.content.age.millis: 86400000 + scheduler.cleanup.interval: 86400000 + ports: + - 8099:8099 + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + share: + build: + context: ./share + args: + SHARE_TAG: ${SHARE_TAG} + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -Xms500m + -Xmx500m + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + + postgres: + image: postgres:${POSTGRES_TAG} + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - 5432:5432 + + activemq: + image: alfresco/alfresco-activemq:${ACTIVE_MQ_TAG} + mem_limit: 1g + ports: + - 8161:8161 # Web Console + - 5672:5672 # AMQP + - 61616:61616 # OpenWire + - 61613:61613 # STOMP + + content-app: + image: quay.io/alfresco/alfresco-digital-workspace:${DIGITAL_WORKSPACE_TAG} + mem_limit: 128m + environment: + BASEPATH: ./ + + # HTTP proxy to provide HTTP Default port access to services + # SOLR API and SOLR Web Console are protected to avoid unauthenticated access + proxy: + image: nginx:stable-alpine + mem_limit: 128m + depends_on: + - alfresco + volumes: + - ./config/nginx.conf:/etc/nginx/nginx.conf + - ./config/nginx.htpasswd:/etc/nginx/conf.d/nginx.htpasswd <% if (httpWebMode == 'https') { %> + - ./config/cert/localhost.cer:/etc/nginx/localhost.cer + - ./config/cert/localhost.key:/etc/nginx/localhost.key <% } %> + ports: + - <%=port%>:<%=port%> + links: + - alfresco + - share + - solr6 + - content-app + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs 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 1c3d53b42..5a1844807 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 @@ -43,11 +43,11 @@ alfresco.secureComms=https 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.keystore.passwordFileLocation= 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 +alfresco.encryption.ssl.truststore.passwordFileLocation= # 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 500cdb897..4309e7f41 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 @@ -43,11 +43,11 @@ alfresco.secureComms=https 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.keystore.passwordFileLocation= 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 +alfresco.encryption.ssl.truststore.passwordFileLocation= # Default Tracker alfresco.cron=0/10 * * * * ? * diff --git a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties index aa07843d0..bedcbe554 100644 --- a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties +++ b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrcore.properties @@ -39,11 +39,11 @@ alfresco.secureComms=none 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.keystore.passwordFileLocation= 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 +alfresco.encryption.ssl.truststore.passwordFileLocation= # Tracking diff --git a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties index aa07843d0..bedcbe554 100644 --- a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties +++ b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrcore.properties @@ -39,11 +39,11 @@ alfresco.secureComms=none 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.keystore.passwordFileLocation= 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 +alfresco.encryption.ssl.truststore.passwordFileLocation= # Tracking diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 46e912dfd..0aef7c191 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -22,7 +22,7 @@ - 8.98 + 8.117 2.10.2 diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java index c55b7ccfc..816488aa8 100644 --- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java +++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java @@ -131,11 +131,10 @@ public class SOLRAPIClientFactory * @param namespaceDAO allows retrieving and creating Namespace definitions * @return an instance of SOLRAPIClient */ - public SOLRAPIClient getSOLRAPIClient(Properties props, KeyResourceLoader keyResourceLoader, - DictionaryService dictionaryService, NamespaceDAO namespaceDAO) + public SOLRAPIClient getSOLRAPIClient(Properties props, KeyResourceLoader keyResourceLoader, DictionaryService dictionaryService, NamespaceDAO namespaceDAO) { - if(Boolean.parseBoolean(System.getProperty("alfresco.test", "false"))) + if (Boolean.parseBoolean(System.getProperty("alfresco.test", "false"))) { return new SOLRAPIQueueClient(namespaceDAO); } @@ -153,20 +152,18 @@ public class SOLRAPIClientFactory secureCommsType = props.getProperty("alfresco.secureComms", "none"); if (secureCommsType.equals("https")) { - sslKeyStoreType = getProperty(props, "alfresco.encryption.ssl.keystore.type", "JCEKS"); - sslKeyStoreProvider = getProperty(props, "alfresco.encryption.ssl.keystore.provider", ""); - sslKeyStoreLocation = getProperty(props, "alfresco.encryption.ssl.keystore.location", - "ssl.repo.client.keystore"); - sslKeyStorePasswordFileLocation = getProperty(props, - "alfresco.encryption.ssl.keystore.passwordFileLocation", - "ssl-keystore-passwords.properties"); - sslTrustStoreType = getProperty(props, "alfresco.encryption.ssl.truststore.type", "JCEKS"); - sslTrustStoreProvider = getProperty(props, "alfresco.encryption.ssl.truststore.provider", ""); - sslTrustStoreLocation = getProperty(props, "alfresco.encryption.ssl.truststore.location", - "ssl.repo.client.truststore"); - sslTrustStorePasswordFileLocation = getProperty(props, - "alfresco.encryption.ssl.truststore.passwordFileLocation", - "ssl-truststore-passwords.properties"); + sslKeyStoreType = getProperty(props, "alfresco.encryption.ssl.keystore.type", "JCEKS"); + sslKeyStoreProvider = getProperty(props, "alfresco.encryption.ssl.keystore.provider", ""); + sslKeyStoreLocation = getProperty(props, "alfresco.encryption.ssl.keystore.location", + "ssl.repo.client.keystore"); + sslKeyStorePasswordFileLocation = getProperty(props, + "alfresco.encryption.ssl.keystore.passwordFileLocation", ""); + sslTrustStoreType = getProperty(props, "alfresco.encryption.ssl.truststore.type", "JCEKS"); + sslTrustStoreProvider = getProperty(props, "alfresco.encryption.ssl.truststore.provider", ""); + sslTrustStoreLocation = getProperty(props, "alfresco.encryption.ssl.truststore.location", + "ssl.repo.client.truststore"); + sslTrustStorePasswordFileLocation = getProperty(props, + "alfresco.encryption.ssl.truststore.passwordFileLocation", ""); } maxTotalConnections = Integer.parseInt(props.getProperty("alfresco.maxTotalConnections", "40")); maxHostConnections = Integer.parseInt(props.getProperty("alfresco.maxHostConnections", "40")); @@ -178,28 +175,29 @@ public class SOLRAPIClientFactory return client; } - + protected AlfrescoHttpClient getRepoClient(KeyResourceLoader keyResourceLoader) { - HttpClientFactory httpClientFactory = null; - - if (secureCommsType.equals("https")) - { - KeyStoreParameters keyStoreParameters = new KeyStoreParameters("SSL Key Store", sslKeyStoreType, - sslKeyStoreProvider, sslKeyStorePasswordFileLocation, sslKeyStoreLocation); - KeyStoreParameters trustStoreParameters = new KeyStoreParameters("SSL Trust Store", sslTrustStoreType, - sslTrustStoreProvider, sslTrustStorePasswordFileLocation, sslTrustStoreLocation); - SSLEncryptionParameters sslEncryptionParameters = new SSLEncryptionParameters(keyStoreParameters, - trustStoreParameters); - httpClientFactory = new HttpClientFactory(SecureCommsType.getType(secureCommsType), - sslEncryptionParameters, keyResourceLoader, null, null, alfrescoHost, alfrescoPort, - alfrescoPortSSL, maxTotalConnections, maxHostConnections, socketTimeout); - } - else - { - httpClientFactory = new PlainHttpClientFactory(alfrescoHost, alfrescoPort, maxTotalConnections, maxHostConnections); - } - + HttpClientFactory httpClientFactory = null; + + if (secureCommsType.equals("https")) + { + KeyStoreParameters keyStoreParameters = new KeyStoreParameters("ssl-keystore", "SSL Key Store", + sslKeyStoreType, sslKeyStoreProvider, sslKeyStorePasswordFileLocation, sslKeyStoreLocation); + KeyStoreParameters trustStoreParameters = new KeyStoreParameters("ssl-truststore", "SSL Trust Store", + sslTrustStoreType, sslTrustStoreProvider, sslTrustStorePasswordFileLocation, sslTrustStoreLocation); + SSLEncryptionParameters sslEncryptionParameters = new SSLEncryptionParameters(keyStoreParameters, + trustStoreParameters); + httpClientFactory = new HttpClientFactory(SecureCommsType.getType(secureCommsType), sslEncryptionParameters, + keyResourceLoader, null, null, alfrescoHost, alfrescoPort, alfrescoPortSSL, maxTotalConnections, + maxHostConnections, socketTimeout); + } + else + { + httpClientFactory = new PlainHttpClientFactory(alfrescoHost, alfrescoPort, maxTotalConnections, + maxHostConnections); + } + AlfrescoHttpClient repoClient = httpClientFactory.getRepoClient(alfrescoHost, alfrescoPortSSL); repoClient.setBaseUrl(baseUrl); return repoClient; diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index a6b85f21e..ef7a8872a 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -56,14 +56,14 @@ jackson-core-2.10.2.jar https://github.com/FasterXML/jackson jackson-annotations-2.10.2.jar https://github.com/FasterXML/jackson jackson-databind-2.10.2.jar https://github.com/FasterXML/jackson commons-httpclient-3.1-HTTPCLIENT-1265.jar http://jakarta.apache.org/commons/ -spring-aop-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-beans-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-context-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-core-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-expression-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-jdbc-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-orm-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ -spring-tx-5.2.5.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-aop-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-beans-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-context-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-core-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-expression-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-jdbc-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-orm-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ +spring-tx-5.2.6.RELEASE.jar http://projects.spring.io/spring-framework/ xercesImpl-2.12.0-alfresco-patched-20191004.jar http://xerces.apache.org/xerces2-j guessencoding-1.4.jar http://docs.codehaus.org/display/GUESSENC/ xml-apis-1.4.01.jar https://github.com/FasterXML/jackson