From d1fe7a0714e1b27b82535d3cf00c7f82841564cb Mon Sep 17 00:00:00 2001 From: Nick Jackson Date: Tue, 17 Oct 2023 10:51:45 +0100 Subject: [PATCH] Can now specify using HTTPS in MarkLogic --- .github/workflows/deploy-production.yml | 1 + .github/workflows/deploy.yml | 1 + template.yml | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index 1155f2c..3748990 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -27,6 +27,7 @@ jobs: MarklogicHost=${{ secrets.MARKLOGIC_HOST }} MarklogicPassword=${{ secrets.MARKLOGIC_PASSWORD }} MarklogicUser=${{ secrets.MARKLOGIC_USER }} + MarklogicUseHttps=${{ vars.MARKLOGIC_USE_HTTPS }} MaxRetries=${{ vars.MAX_RETRIES }} NotifyApiKey=${{ secrets.NOTIFY_API_KEY }} NotifyEditorialAddress=${{ vars.NOTIFY_EDITORIAL_ADDRESS }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9144f43..0157828 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,6 +26,7 @@ jobs: MarklogicHost=${{ secrets.MARKLOGIC_HOST }} MarklogicPassword=${{ secrets.MARKLOGIC_PASSWORD }} MarklogicUser=${{ secrets.MARKLOGIC_USER }} + MarklogicUseHttps=${{ vars.MARKLOGIC_USE_HTTPS }} MaxRetries=${{ vars.MAX_RETRIES }} NotifyApiKey=${{ secrets.NOTIFY_API_KEY }} NotifyEditorialAddress=${{ vars.NOTIFY_EDITORIAL_ADDRESS }} diff --git a/template.yml b/template.yml index 6c3bee0..8fff3ff 100644 --- a/template.yml +++ b/template.yml @@ -26,6 +26,9 @@ Parameters: MarklogicUser: Description: "MARKLOGIC_USER" Type: "String" + MarklogicUseHttps: + Description: "MARKLOGIC_USE_HTTPS" + Type: "String" MaxRetries: Description: "MAX_RETRIES" Type: "String" @@ -71,6 +74,7 @@ Resources: MARKLOGIC_HOST: !Ref MarklogicHost MARKLOGIC_PASSWORD: !Ref MarklogicPassword MARKLOGIC_USER: !Ref MarklogicUser + MARKLOGIC_USE_HTTPS: !Ref MarklogicUseHttps MAX_RETRIES: !Ref MaxRetries NOTIFY_API_KEY: !Ref NotifyApiKey NOTIFY_EDITORIAL_ADDRESS: !Ref NotifyEditorialAddress