Merge branch 'acs-aims-enterprise' into ags-aims-enterprise
This commit is contained in:
commit
650e7201b1
@ -37,7 +37,8 @@ services:
|
|||||||
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
|
||||||
-Ddeployment.method=DOCKER_COMPOSE
|
-Ddeployment.method=DOCKER_COMPOSE
|
||||||
-Dcsrf.filter.enabled=false
|
-Dcsrf.filter.enabled=false
|
||||||
-Dcors.enabled=false
|
-Dcors.enabled=true
|
||||||
|
-Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
|
||||||
-Dtransform.service.enabled=true
|
-Dtransform.service.enabled=true
|
||||||
-Dtransform.service.url=http://transform-router:8095
|
-Dtransform.service.url=http://transform-router:8095
|
||||||
-Dsfs.url=http://shared-file-store:8099
|
-Dsfs.url=http://shared-file-store:8099
|
||||||
@ -50,7 +51,7 @@ services:
|
|||||||
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
|
-Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
|
||||||
-Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
|
-Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
|
||||||
-Didentity-service.authentication.defaultAdministratorUserNames=admin.1
|
-Didentity-service.authentication.defaultAdministratorUserNames=admin.1
|
||||||
-Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
|
-Didentity-service.auth-server-url=http://identity:8080/auth
|
||||||
-Dsystem.content.eagerOrphanCleanup=true
|
-Dsystem.content.eagerOrphanCleanup=true
|
||||||
-Dsystem.content.orphanProtectDays=0
|
-Dsystem.content.orphanProtectDays=0
|
||||||
-Djodconverter.enabled=false
|
-Djodconverter.enabled=false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user