Merge branch 'main' into migueldasilva/v0.14.0-no-retention-policy

microsoft · Oct 18, 2023 · 53b126c · 53b126c
2 parents d46dea0 + 22f4613
commit 53b126c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,12 +6,12 @@ FEATURES:
 ENHANCEMENTS:
 
 BUG FIXES:
+* Remove .sh extension from nexus renewal script so CRON job executes ([#3742](https://github.com/microsoft/AzureTRE/issues/3742))
 * Upgrade porter version to v1.0.15 and on error getting porter outputs return dict ([#3744](https://github.com/microsoft/AzureTRE/issues/3744))
 * Fix notifications displaying workspace name rather than actual resource ([#3746](https://github.com/microsoft/AzureTRE/issues/3746))
 * Fix SecuredByRole fails if app roles are not loaded  ([#3752](https://github.com/microsoft/AzureTRE/issues/3752))
 * Fix workspace not loading fails if operation or history roles are not loaded  ([#3755](https://github.com/microsoft/AzureTRE/issues/3755))
 
-
 COMPONENTS:
 
 ## 0.15.1 (October 18, 2023)

diff --git a/templates/shared_services/sonatype-nexus-vm/porter.yaml b/templates/shared_services/sonatype-nexus-vm/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-sonatype-nexus
-version: 2.8.12
+version: 2.8.13
 description: "A Sonatype Nexus shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/cloud-config.yaml b/templates/shared_services/sonatype-nexus-vm/terraform/cloud-config.yaml
@@ -45,6 +45,6 @@ runcmd:
   # Reset the admin password of Nexus to the one created by TF and stored in Key Vault
   - bash /etc/nexus-data/scripts/reset_nexus_password.sh "${NEXUS_ADMIN_PASSWORD}"
   # Invoke Nexus SSL configuration (which will also be ran as CRON daily to renew cert)
-  - bash /etc/cron.daily/configure_nexus_ssl.sh
+  - bash /etc/cron.daily/configure_nexus_ssl
   # Configure Nexus repositories
   - bash /etc/nexus-data/scripts/configure_nexus_repos.sh "${NEXUS_ADMIN_PASSWORD}"
diff --git a/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf b/templates/shared_services/sonatype-nexus-vm/terraform/vm.tf
@@ -189,7 +189,7 @@ data "template_cloudinit_config" "nexus_config" {
         },
         {
           content     = data.template_file.configure_nexus_ssl.rendered
-          path        = "/etc/cron.daily/configure_nexus_ssl.sh"
+          path        = "/etc/cron.daily/configure_nexus_ssl"
           permissions = "0755"
         },
         {