diff --git a/CHANGELOG.md b/CHANGELOG.md index 663a794d..5eb06c3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 5.19.0.1 - 2023-05-14 +### Added +- Add aem.truststore.enable_deletion_before_creation configuration + +### Changed +- Upgrade AEM AWS Stack Provisioner to 5.11.0.1 + ## 5.19.0 - 2022-11-22 ## 5.18.0 - 2022-10-26 diff --git a/conf/ansible/inventory/group_vars/apps.yaml b/conf/ansible/inventory/group_vars/apps.yaml index 0a97e4b1..e74b0757 100644 --- a/conf/ansible/inventory/group_vars/apps.yaml +++ b/conf/ansible/inventory/group_vars/apps.yaml @@ -40,6 +40,7 @@ aem: # Parameters for managing AEM Truststore truststore: enable_creation: false + enable_deletion_before_creation: false enable_saml_certificate_upload: false password: publish: @@ -160,7 +161,7 @@ s3: create_bucket_flag: 'true' library: - aem_aws_stack_provisioner_version: 5.11.0 + aem_aws_stack_provisioner_version: 5.11.0.1 aem_orchestrator_version: 3.0.1 aem_password_reset_version: 1.1.0 oak_run_version: 1.8.3 diff --git a/docs/configuration.md b/docs/configuration.md index 55dd54fb..c8c786b3 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -295,6 +295,7 @@ These configurations are applicable for both AEM Full-Set and Consolidated archi | aem.author.jmxremote.port | AEM Author's [JMX](https://docs.oracle.com/javase/8/docs/technotes/guides/management/agent.html) remote port. | Optional | 59182 | | aem.publish.jmxremote.port | AEM Publish's [JMX](https://docs.oracle.com/javase/8/docs/technotes/guides/management/agent.html) remote port. | Optional | 59182 | | aem.truststore.enable_creation | If set to true, AEM Global Truststore will be created for AEM Author | Optional | false | +| aem.truststore.enable_deletion_before_creation | If set to true, AEM Global Truststore will be deleted first before it is created for AEM Author. This is only relevant if `aem.truststore.enable_creation` is set to true | Optional | false | | aem.truststore.password | AEM Global Truststore password | Optional | false | ### AEM Full-Set specific configuration properties: diff --git a/templates/ansible/stack-provisioner-hieradata.j2 b/templates/ansible/stack-provisioner-hieradata.j2 index 222dac16..e400c3b5 100644 --- a/templates/ansible/stack-provisioner-hieradata.j2 +++ b/templates/ansible/stack-provisioner-hieradata.j2 @@ -217,6 +217,7 @@ common::authorizable_keystore::enable_certificate_chain_upload: {{ aem.authoriza # Truststore parameters common::truststore::enable_creation: {{ aem.truststore.enable_creation }} +common::truststore::enable_deletion_before_creation: {{ aem.truststore.enable_deletion_before_creation }} common::truststore::enable_migration: {{ reconfiguration.enable_truststore_migration }} common::truststore::password: {{ aem.truststore.password }}