From 0fc9bd2c4713c8af57bbc358ac901c1e983570cd Mon Sep 17 00:00:00 2001 From: "don.sizemore" Date: Tue, 27 Jul 2021 14:42:49 -0400 Subject: [PATCH] #163 correct combined conditionals --- tasks/s3.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tasks/s3.yml b/tasks/s3.yml index 08ea35e..b2ea90c 100644 --- a/tasks/s3.yml +++ b/tasks/s3.yml @@ -77,8 +77,7 @@ owner: '{{ dataverse.payara.user }}' group: '{{ dataverse.payara.group }}' mode: 0644 - when: (s3.download_redirect == true - or s3.upload_redirect == true) + when: (s3.download_redirect == true or s3.upload_redirect == true) and s3.cors_already_set == false - name: enable CORS on S3 bucket @@ -90,8 +89,7 @@ become_user: '{{ dataverse.payara.user }}' environment: PATH: "{{ lookup('env', 'PATH') }}:/usr/local/bin" - when: (s3.download_redirect == true - or s3.upload_redirect == true) + when: (s3.download_redirect == true or s3.upload_redirect == true) and custom_endpoint_url | length == 0 and cors_already_set = false