From 342b9e79bb9ddf3ac8e2a24bbce1a82cc49d1fd7 Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Thu, 4 Jun 2020 08:20:47 -0400
Subject: [PATCH] more updates

---
 .../feature-server.ecosystem.config.js.tmpl                | 2 +-
 terraform/jambonz-devtest/feature-server.tf                | 7 ++-----
 .../sbc-sip-rtp-server.ecosystem.config.js.tmpl            | 2 +-
 .../jambonz-prod/feature-server.ecosystem.config.js.tmpl   | 2 +-
 .../jambonz-prod/sbc-rtp-server.ecosystem.config.js.tmpl   | 2 +-
 .../jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl   | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl b/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl
index 04ce7e2..3e334b2 100644
--- a/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-devtest/feature-server.ecosystem.config.js.tmpl
@@ -75,7 +75,7 @@ tags:
 EOT
 
   systemctl enable datadog-agent
-  systemctl start datadog-agent
+  systemctl restart datadog-agent
 fi
 
 echo "user data script completed"
diff --git a/terraform/jambonz-devtest/feature-server.tf b/terraform/jambonz-devtest/feature-server.tf
index 8e02495..1404678 100644
--- a/terraform/jambonz-devtest/feature-server.tf
+++ b/terraform/jambonz-devtest/feature-server.tf
@@ -1,6 +1,6 @@
 # create an SNS notification topic
 resource "aws_sns_topic" "jambonz_sns_topic" {
-  name = "${var.prefix}-fs-lifecycle-events"
+#  name = "${var.prefix}-fs-lifecycle-events"
 }
 
 resource "aws_iam_role" "jambonz_sns_publish" {
@@ -41,7 +41,7 @@ resource "aws_iam_policy" "allow_jambonz_sns_publish" {
 EOF
 }
 
-resource "aws_iam_role_policy_attachment" "sns-publish-policy-attachment" {
+resource "aws_iam_role_policy_attachment" "sns_publish_policy_attachment" {
     role = aws_iam_role.jambonz_sns_publish.name
     policy_arn = aws_iam_policy.allow_jambonz_sns_publish.arn
 }
@@ -122,7 +122,4 @@ resource "aws_autoscaling_lifecycle_hook" "jambonz-scale-in" {
   lifecycle_transition   = "autoscaling:EC2_INSTANCE_TERMINATING"
   notification_target_arn = aws_sns_topic.jambonz_sns_topic.arn
   role_arn                = aws_iam_role.jambonz_sns_publish.arn
-
-  depends_on = [aws_sns_topic.jambonz_sns_topic]
-
 }
\ No newline at end of file
diff --git a/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl b/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl
index 43e6443..eb14c31 100644
--- a/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-devtest/sbc-sip-rtp-server.ecosystem.config.js.tmpl
@@ -185,7 +185,7 @@ tags:
 EOT
 
   systemctl enable datadog-agent
-  systemctl start datadog-agent
+  systemctl restart datadog-agent
   
 fi
 
diff --git a/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl b/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl
index 04ce7e2..3e334b2 100644
--- a/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-prod/feature-server.ecosystem.config.js.tmpl
@@ -75,7 +75,7 @@ tags:
 EOT
 
   systemctl enable datadog-agent
-  systemctl start datadog-agent
+  systemctl restart datadog-agent
 fi
 
 echo "user data script completed"
diff --git a/terraform/jambonz-prod/sbc-rtp-server.ecosystem.config.js.tmpl b/terraform/jambonz-prod/sbc-rtp-server.ecosystem.config.js.tmpl
index e965f16..088a5e8 100644
--- a/terraform/jambonz-prod/sbc-rtp-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-prod/sbc-rtp-server.ecosystem.config.js.tmpl
@@ -14,6 +14,6 @@ tags:
 EOT
 
   systemctl enable datadog-agent
-  systemctl start datadog-agent
+  systemctl restart datadog-agent
   
 fi
diff --git a/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl b/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl
index 43e6443..eb14c31 100644
--- a/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl
+++ b/terraform/jambonz-prod/sbc-sip-server.ecosystem.config.js.tmpl
@@ -185,7 +185,7 @@ tags:
 EOT
 
   systemctl enable datadog-agent
-  systemctl start datadog-agent
+  systemctl restart datadog-agent
   
 fi