Merge branch 'master' into ERM-3579

folio-org · Mar 6, 2025 · be03447 · be03447
2 parents 6dc30b0 + ab95370
commit be03447
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/service/build.gradle b/service/build.gradle
@@ -200,7 +200,9 @@ bootRun {
     '-Dspring.output.ansi.enabled=always',
     '-noverify',
     '-XX:TieredStopAtLevel=1',
-    '-Xmx1592m')
+    //'-Xmx1374m'
+    '-Xmx1592m'
+  )
 	sourceResources sourceSets.main
 	String springProfilesActive = 'spring.profiles.active'
 	systemProperty springProfilesActive, System.getProperty(springProfilesActive)

diff --git a/service/grails-app/conf/application.yml b/service/grails-app/conf/application.yml
@@ -245,7 +245,7 @@ environments:
       filestore:
         aws_region: "${aws.region:us-east-1}"
         aws_url: "${aws.url}"
-        aws_secret: "${aws.secret.access.key:none}"
+        aws_secret: "${aws.secret.access.key}"
         aws_bucket: "${aws.bucket:none}"
         aws_access_key_id: "${aws.access.key.id:none}"
 

diff --git a/service/grails-app/services/org/olf/ErmHousekeepingService.groovy b/service/grails-app/services/org/olf/ErmHousekeepingService.groovy
@@ -63,7 +63,7 @@ public class ErmHousekeepingService {
             [ 'fileStorage', 'storageEngine', 'String', 'FileStorageEngines', 'LOB' ],
             [ 'fileStorage', 'S3Endpoint',    'String', null,                 default_aws_url ?: 'http://s3_endpoint_host.domain:9000' ],
             [ 'fileStorage', 'S3AccessKey',   'String', null,                 default_aws_access_key_id ?: 'ACCESS_KEY' ],
-            [ 'fileStorage', 'S3SecretKey',   'String', null,                 default_aws_secret ?: 'SECRET_KEY' ],
+            [ 'fileStorage', 'S3SecretKey',   'String', null,                 default_aws_secret ],
             [ 'fileStorage', 'S3BucketName',  'String', null,                 default_aws_bucket ?: "${tenantId}-shared" ],
             [ 'fileStorage', 'S3ObjectPrefix','String', null,                 "/${tenantId}/agreements/" ],
             [ 'fileStorage', 'S3BucketRegion','String', null,                 default_aws_region ],