Merge branch 'acs-backend' into acs-frontend

Merge branch 'acs-lats' into acs-backend
Merge branch 'acs-search' into acs-backend
2023-11-01 14:25:55 -04:00 · 2023-11-01 14:25:01 -04:00 · 2023-11-01 14:24:57 -04:00 · 2023-11-01 14:23:23 -04:00 · 2023-11-01 14:23:12 -04:00 · 2023-11-01 14:21:02 -04:00
1 changed files with 2 additions and 1 deletions
@@ -43,7 +43,8 @@ services:
                -Dtika.url=http://transform-core-aio:8090/
                -Dtransform.misc.url=http://transform-core-aio:8090/
                -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=false
                -Dlocal.transform.service.enabled=true
                -Dsystem.content.eagerOrphanCleanup=true
Author	SHA1	Message	Date
brian.long	aa2aceb8ed	Merge branch 'acs-backend' into acs-frontend	2023-11-01 14:25:55 -04:00
brian.long	faa633c46c	Merge branch 'acs-lats' into acs-backend	2023-11-01 14:25:01 -04:00
brian.long	72026e2ad2	Merge branch 'acs-search' into acs-backend	2023-11-01 14:24:57 -04:00
brian.long	ab44e01638	Merge branch 'acs' into acs-lats	2023-11-01 14:23:23 -04:00
brian.long	b3c89aa9ce	Merge branch 'acs' into acs-search	2023-11-01 14:23:12 -04:00
brian.long	fbda2bcdde	configure CORS in ACS	2023-11-01 14:21:02 -04:00