diff --git a/CHANGELOG.md b/CHANGELOG.md index fc1a598..af4b625 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ tf_chef_compliance CHANGELOG This file is used to list changes made in each version of the tf_chef_compliance Terraform plan. +v0.1.5 (2016-05-25) +------------------- +- [Brian Menges] - Correct `accept_license` in [attributes-json.tpl](files/attributes-json.tpl) +- [Brian Menges] - Remove legacy `touch .license.accepted` remote-exec + v0.1.4 (2016-05-25) ------------------- - [Brian Menges] - Correct [CHANGELOG.md](CHANGELOG.md) diff --git a/files/attributes-json.tpl b/files/attributes-json.tpl index 4df95b0..f9571fb 100644 --- a/files/attributes-json.tpl +++ b/files/attributes-json.tpl @@ -1,7 +1,7 @@ { "fqdn": "${host}.${domain}", "chef-compliance": { - "accept_license": "${license}", + "accept_license": ${license}, "configuration": { "compliance_fqdn": "${host}.${domain}", "ssl": { @@ -21,4 +21,3 @@ }, "tags": [] } - diff --git a/main.tf b/main.tf index 9fac26d..11e4a47 100644 --- a/main.tf +++ b/main.tf @@ -153,12 +153,6 @@ resource "aws_instance" "chef-compliance" { "sudo mv .compliance/${var.hostname}.${var.domain}.* /var/opt/chef-compliance/ssl", "sudo chown -R root:root /etc/chef-compliance /var/opt/chef-compliance/ssl", ] - } - # Accept license - provisioner "remote-exec" { - inline = [ - "sudo touch /var/opt/chef-compliance/.license.accepted" - ] } # Provision with Chef provisioner "chef" {