From bece52b40e82a3df4b57167db8c68950ad6b7857 Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Sun, 9 Apr 2023 21:17:16 -0400
Subject: [PATCH] changes for gcp

---
 packer/jambonz-mini/gcp-template.json        | 11 +++++------
 terraform/gcp/jambonz-mini/deployment.tf     |  2 +-
 terraform/gcp/jambonz-mini/deployment.tfvars |  8 +++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packer/jambonz-mini/gcp-template.json b/packer/jambonz-mini/gcp-template.json
index 3c76231..dd11635 100644
--- a/packer/jambonz-mini/gcp-template.json
+++ b/packer/jambonz-mini/gcp-template.json
@@ -1,7 +1,10 @@
 {
   "variables": {
     "cloud_provider": "gcp",
-    "region": "us-east-1",
+    "project_id": "drachtio-cpaas",
+    "source_image_family": "debian-11",
+    "source_image_project_id": "debian-cloud",
+    "image_zone": "us-central1-c",
     "ssh_username": "admin",
     "ami_description": "jambonz-mini (all-in-one server)", 
     "instance_type": "c2-standard-4",
@@ -22,11 +25,7 @@
     "rtp_engine_min_port": "40000",
     "rtp_engine_max_port": "60000",
     "mediaserver_name" : "jambonz",
-    "preferred_codec_list" : "PCMU,PCMA,OPUS,G722",
-    "project_id": "drachtio-cpaas",
-    "source_image_family": "debian-11",
-    "source_image_project_id": "debian-cloud",
-    "image_zone": "us-central1-c"
+    "preferred_codec_list" : "PCMU,PCMA,OPUS,G722"
   },
   "builders": [
     {
diff --git a/terraform/gcp/jambonz-mini/deployment.tf b/terraform/gcp/jambonz-mini/deployment.tf
index 7eab2b7..59f8052 100644
--- a/terraform/gcp/jambonz-mini/deployment.tf
+++ b/terraform/gcp/jambonz-mini/deployment.tf
@@ -79,7 +79,7 @@ uuid=$(uuidgen)
 sudo sed -i -e "s/\(.*\)JWT-SECRET-GOES_HERE\(.*\)/\1$uuid\2/g" /home/admin/apps/ecosystem.config.js 
 
 #Add BasicAuth password for Jaeger
-sudo htpasswd -b -c /etc/nginx/.htpasswd $JAEGER_USERNAME "$JAEGER_PASSWORD"
+sudo htpasswd -b -c /etc/nginx/.htpasswd admin "JambonzR0ck$"
 
 # configure webapp
 if [[ -z $DNS_NAME ]]; then
diff --git a/terraform/gcp/jambonz-mini/deployment.tfvars b/terraform/gcp/jambonz-mini/deployment.tfvars
index 6f13794..eac0c8a 100644
--- a/terraform/gcp/jambonz-mini/deployment.tfvars
+++ b/terraform/gcp/jambonz-mini/deployment.tfvars
@@ -1,8 +1,6 @@
-image = "packer-1680730500"
+image = "packer-1681065267"
 region = "us-central1"
-zone = "us-central1-b"
+zone = "us-central1-a"
 project = "drachtio-cpaas"
 dns_name = "jambonz.me"
-instance_type = "e2-medium"
-jaeger_username = "admin"
-jaeger_password = "JambonzR0ck$"
\ No newline at end of file
+instance_type = "e2-medium"
\ No newline at end of file