Merge pull request #110 from nationalarchives/fix/marklogic-use-https…

…-value Can now specify using HTTPS in MarkLogic
nationalarchives · Oct 17, 2023 · 88998ce · 88998ce
2 parents dc0a326 + d1fe7a0
commit 88998ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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