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 a53d3d5c0..568bcffbd 100644 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js @@ -295,7 +295,8 @@ module.exports = class extends Generator { // Add resources for SSL configuration if (this.props.httpMode == 'https') { - var subfolder = this.props.acsVersion == 'latest' ? '7.x' : '6.x' + // 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/' + subfolder + '/alfresco'), this.destinationPath('keystores/alfresco') 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 6c13bf1ed..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 @@ -41,8 +41,10 @@ RUN if [ "$ALFRESCO_COMMS" == "https" ] ; then \ 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 \ diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.keystore new file mode 100644 index 000000000..f1474dd04 Binary files /dev/null and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.keystore differ 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 000000000..c09e6891a Binary files /dev/null and b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl-repo-client.truststore differ diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl.repo.client.keystore b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl.repo.client.keystore deleted file mode 100644 index b0dc4ef08..000000000 Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl.repo.client.keystore and /dev/null differ 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 deleted file mode 100644 index 2feb2d827..000000000 Binary files a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/keystores/7.x/zeppelin/ssl.repo.client.truststore and /dev/null differ diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/.env b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/.env index 405062f6a..05f939870 100755 --- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/.env +++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/.env @@ -1,4 +1,4 @@ -ALFRESCO_TAG=latest +ALFRESCO_TAG=6.3.0-A10 ALFRESCO_CE_TAG=latest SHARE_TAG=latest POSTGRES_TAG=11.4 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 index 5b3ebb509..e31850d90 100755 --- 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 @@ -15,6 +15,24 @@ services: 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 @@ -31,14 +49,6 @@ services: -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE - -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 <% } %> - -Dtransform.service.enabled=true -Dtransform.service.url=http://transform-router:8095 -Dsfs.url=http://shared-file-store:8099/ @@ -52,15 +62,6 @@ services: -Dcsrf.filter.enabled=false -Dalfresco.restApi.basicAuthScheme=true -Xms1500m -Xmx1500m - <% if (httpMode == 'https') { %> - -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 <% } %> " <% if (httpMode == 'https') { %> ports: - 8443:8443 @@ -115,9 +116,7 @@ services: 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 + JAVA_TOOL_OPTIONS: " -Dssl-keystore.password=kT9X6oe68t -Dssl-keystore.aliases=ssl-alfresco-ca,ssl-repo-client -Dssl-keystore.ssl-alfresco-ca.password=kT9X6oe68t @@ -127,6 +126,10 @@ services: -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') { %> @@ -183,9 +186,7 @@ services: 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 + JAVA_TOOL_OPTIONS: " -Dssl-keystore.password=kT9X6oe68t -Dssl-keystore.aliases=ssl-alfresco-ca,ssl-repo-client -Dssl-keystore.ssl-alfresco-ca.password=kT9X6oe68t @@ -194,7 +195,11 @@ services: -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 + -Dssl-truststore.ssl-repo-client.password=kT9X6oe68t + " + SOLR_OPTS: " + -Dsolr.ssl.checkPeerName=false + -Dsolr.allow.unsafe.resourceloading=true " <% } %> ports: - 8084:8983 <% if (httpMode == 'https') { %> @@ -214,15 +219,17 @@ services: 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 - -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 " <% } %> ports: - 9090:9090 <% if (httpMode == 'https') { %>