inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2025-09-17 14:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/acs 2562 disallow secure comms none (#1466)

Browse Source 
* ACS-2562 Replace secureComms.secret with sharedSecret

* ACS-2562 Replace secureComms.secret with sharedSecret

* ACS-2562 Change SOLR6_TAG to 2.0.3-RC2

* ACS-2471 Remove references to secureComms=none for dev

* ACS-2562 Remove references to secureComms=none for dev
This commit is contained in:
Damian Ujma
2022-03-04 11:17:08 +01:00
committed by GitHub
parent 72cb0fdf23
commit c1d1cdfd77
5 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev/dev-acs-amps-overlay/pom.xml
View File

@@ -69,7 +69,8 @@
<dir.root>${runtime.data.folder}/alf_data</dir.root> <dir.root>${runtime.data.folder}/alf_data</dir.root>
<solr.host>localhost</solr.host> <solr.host>localhost</solr.host>
<solr.base.url>/solr</solr.base.url> <solr.base.url>/solr</solr.base.url>
<solr.secureComms>none</solr.secureComms> <solr.secureComms>secret</solr.secureComms>
<solr.sharedSecret>secret</solr.sharedSecret>
<encryption.keystore.type>pkcs12</encryption.keystore.type> <encryption.keystore.type>pkcs12</encryption.keystore.type>
<encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm> <encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm>
<encryption.keyAlgorithm>AES</encryption.keyAlgorithm> <encryption.keyAlgorithm>AES</encryption.keyAlgorithm>

20
dev/docker-compose.yml
View File

@@ -25,20 +25,24 @@ services:
- 5432:5432 - 5432:5432
solr6: solr6:
image: alfresco/alfresco-search-services:2.0.0 image: alfresco/alfresco-search-services:2.0.3-RC2
mem_limit: 2g mem_limit: 2g
environment: environment:
#Solr needs to know how to register itself with Alfresco #Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco SOLR_ALFRESCO_HOST: "alfresco"
- SOLR_ALFRESCO_PORT=8080 SOLR_ALFRESCO_PORT: "8080"
#Alfresco needs to know how to call solr #Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6 SOLR_SOLR_HOST: "solr6"
- SOLR_SOLR_PORT=8983 SOLR_SOLR_PORT: "8983"
#Create the default alfresco and archive cores #Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
#HTTP by default #HTTP by default
- ALFRESCO_SECURE_COMMS=none ALFRESCO_SECURE_COMMS: "secret"
- "SOLR_JAVA_MEM=-Xms2g -Xmx2g" JAVA_TOOL_OPTIONS:
"
-Dalfresco.secureComms.secret=secret
"
SOLR_JAVA_MEM: "-Xms2g -Xmx2g"
ports: ports:
- 8083:8983 #Browser port - 8083:8983 #Browser port

2
tests/environment/.env
View File

@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=2.5.7-A6 TRANSFORMERS_TAG=2.5.7-A6
SOLR6_TAG=2.0.2 SOLR6_TAG=2.0.3-RC2
POSTGRES_TAG=13.3 POSTGRES_TAG=13.3
ACTIVEMQ_TAG=5.16.1 ACTIVEMQ_TAG=5.16.1

19
tests/environment/docker-compose-minimal+transforms.yml
View File

@@ -28,7 +28,8 @@ services:
-Ddb.url=jdbc:postgresql://postgres:5432/alfresco -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-Dsolr.host=solr6 -Dsolr.host=solr6
-Dsolr.port=8983 -Dsolr.port=8983
-Dsolr.secureComms=none -Dsolr.secureComms=secret
-Dsolr.sharedSecret=secret
-Dsolr.base.url=/solr -Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6 -Dindex.subsystem.name=solr6
-Dalfresco.restApi.basicAuthScheme=true -Dalfresco.restApi.basicAuthScheme=true
@@ -63,15 +64,19 @@ services:
image: alfresco/alfresco-search-services:${SOLR6_TAG} image: alfresco/alfresco-search-services:${SOLR6_TAG}
environment: environment:
#Solr needs to know how to register itself with Alfresco #Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco SOLR_ALFRESCO_HOST: "alfresco"
- SOLR_ALFRESCO_PORT=8080 SOLR_ALFRESCO_PORT: "8080"
#Alfresco needs to know how to call solr #Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6 SOLR_SOLR_HOST: "solr6"
- SOLR_SOLR_PORT=8983 SOLR_SOLR_PORT: "8983"
#Create the default alfresco and archive cores #Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
#HTTP by default #HTTP by default
- ALFRESCO_SECURE_COMMS=none ALFRESCO_SECURE_COMMS: "secret"
JAVA_TOOL_OPTIONS:
"
-Dalfresco.secureComms.secret=secret
"
ports: ports:
- 8083:8983 #Browser port - 8083:8983 #Browser port

19
tests/environment/docker-compose-minimal.yml
View File

@@ -28,7 +28,8 @@ services:
-Ddb.url=jdbc:postgresql://postgres:5432/alfresco -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-Dsolr.host=solr6 -Dsolr.host=solr6
-Dsolr.port=8983 -Dsolr.port=8983
-Dsolr.secureComms=none -Dsolr.secureComms=secret
-Dsolr.sharedSecret=secret
-Dsolr.base.url=/solr -Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6 -Dindex.subsystem.name=solr6
-Dalfresco.restApi.basicAuthScheme=true -Dalfresco.restApi.basicAuthScheme=true
@@ -66,15 +67,19 @@ services:
image: alfresco/alfresco-search-services:${SOLR6_TAG} image: alfresco/alfresco-search-services:${SOLR6_TAG}
environment: environment:
#Solr needs to know how to register itself with Alfresco #Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco SOLR_ALFRESCO_HOST: "alfresco"
- SOLR_ALFRESCO_PORT=8080 SOLR_ALFRESCO_PORT: "8080"
#Alfresco needs to know how to call solr #Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6 SOLR_SOLR_HOST: "solr6"
- SOLR_SOLR_PORT=8983 SOLR_SOLR_PORT: "8983"
#Create the default alfresco and archive cores #Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
#HTTP by default #HTTP by default
- ALFRESCO_SECURE_COMMS=none ALFRESCO_SECURE_COMMS: "secret"
JAVA_TOOL_OPTIONS:
"
-Dalfresco.secureComms.secret=secret
"
ports: ports:
- 8083:8983 #Browser port - 8083:8983 #Browser port