Merge pull request #564 from qld-gov-au/develop

Develop to master
qld-gov-au · Aug 6, 2024 · 5fd5706 · 5fd5706
2 parents 5c8d641 + a214654
commit 5fd5706
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/files/instanceSetupLambda.js b/files/instanceSetupLambda.js
@@ -104,6 +104,7 @@ exports.handler = async (event) => {
   }
 
   await ssm.send(new SendCommandCommand({
+    Comment: `Running '${deployPhase}' on ${service} ${environment} instance ${instanceId}`,
     DocumentName: "AWS-ApplyChefRecipes",
     DocumentVersion: '\$DEFAULT',
     InstanceIds: [ instanceId ],

diff --git a/vars/CKAN-Stack.var.yml b/vars/CKAN-Stack.var.yml
@@ -5,7 +5,7 @@ NonProductionAnalyticsId: "{{ lookup('aws_ssm', '/config/CKAN/GaIdNonProduction'
 ProductionAnalyticsId: "{{ lookup('aws_ssm', '/config/CKAN/GaIdProduction', region=region) }}"
 
 solr_url: "https://archive.apache.org/dist/lucene/solr/8.11.2/solr-8.11.2.zip"
-ckan_tag: "ckan-2.10.4-qgov.3"
+ckan_tag: "ckan-2.10.4-qgov.4"
 ckan_qgov_branch: "qgov-master-2.10.4"
 
 common_stack: &common_stack
@@ -40,7 +40,7 @@ common_stack: &common_stack
     EnableDataStore: "{{ enable_datastore | default('no') }}"
     SSMKey: "{{ SSMKey | default('') }}"
     DefaultEC2Key: "{{ lookup('aws_ssm', '/config/CKAN/ec2KeyPair', region=region) }}"
-    CookbookRevision: "{{ CookbookRevision | default('7.1.1') }}"
+    CookbookRevision: "{{ CookbookRevision | default('7.1.3') }}"
     LogBucketName: "{{ lookup('aws_ssm', '/config/CKAN/s3LogsBucket', region=region) }}"
     AttachmentsBucketName: "{{ lookup('aws_ssm', '/config/CKAN/' + Environment + '/app/' + service_name_lower + '/s3AttachmentBucket', region=region) }}" #/config/CKAN/PROD/app/opendata/s3AttachmentBucket
     SolrSource: "{{ solr_url }}"

diff --git a/vars/shared-CKANTest.var.yml b/vars/shared-CKANTest.var.yml
@@ -71,7 +71,7 @@ extensions:
       description: "CKAN Extension for Queensland Government Open Data"
       type: "git"
       url: "https://github.com/qld-gov-au/ckanext-data-qld.git"
-      version: "7.2.11"
+      version: "7.2.12"
 
     CKANExtDataRequests: &CKANExtDataRequests
       name: "ckanext-datarequests-{{ Environment }}"

diff --git a/vars/shared-OpenData.var.yml b/vars/shared-OpenData.var.yml
@@ -71,7 +71,7 @@ extensions:
       description: "CKAN Extension for Queensland Government Open Data"
       type: "git"
       url: "https://github.com/qld-gov-au/ckanext-data-qld.git"
-      version: "7.2.11"
+      version: "7.2.12"
 
     CKANExtDataRequests: &CKANExtDataRequests
       name: "ckanext-datarequests-{{ Environment }}"