From 680ffa9ba764c758bcdabc1820bb7c85655a1edf Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Sat, 25 Mar 2023 11:33:04 -0400 Subject: [PATCH] update to v0.8.2-rc11, fix homer-app config --- cloudformation/jambonz-mini.yaml | 2 +- packer/jambonz-feature-server/template.json | 2 +- packer/jambonz-mini/scripts/install_homer.sh | 1 + packer/jambonz-mini/template.json | 14 +++++++------- packer/jambonz-monitoring/scripts/install_homer.sh | 1 + packer/jambonz-monitoring/template.json | 2 +- packer/jambonz-sbc-rtp/template.json | 4 ++-- packer/jambonz-sbc-sip/template.json | 2 +- packer/jambonz-web-server/template.json | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/cloudformation/jambonz-mini.yaml b/cloudformation/jambonz-mini.yaml index a459ee0..73784b0 100644 --- a/cloudformation/jambonz-mini.yaml +++ b/cloudformation/jambonz-mini.yaml @@ -103,7 +103,7 @@ Conditions: Mappings: AWSRegion2AMI: us-east-1: - Ami: ami-0e0d12a458c86f7fb + Ami: ami-0f32d62635b3ad5f8 Resources: IamCloudwatchRole: diff --git a/packer/jambonz-feature-server/template.json b/packer/jambonz-feature-server/template.json index 27b0a7d..cafe5ad 100644 --- a/packer/jambonz-feature-server/template.json +++ b/packer/jambonz-feature-server/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz feature server", "instance_type": "t2.xlarge", "drachtio_version": "v0.8.21", - "jambonz_version": "v0.8.2-rc3", + "jambonz_version": "v0.8.2-rc11", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "install_telegraf": "yes", diff --git a/packer/jambonz-mini/scripts/install_homer.sh b/packer/jambonz-mini/scripts/install_homer.sh index b859abb..14717c6 100644 --- a/packer/jambonz-mini/scripts/install_homer.sh +++ b/packer/jambonz-mini/scripts/install_homer.sh @@ -7,6 +7,7 @@ DB_PASS=$3 curl -s https://packagecloud.io/install/repositories/qxip/sipcapture/script.deb.sh | sudo bash sudo apt-get install -y homer-app heplify-server +sudo cp /usr/local/homer/etc/webapp_config.json.example /usr/local/homer/etc/webapp_config.json sudo sed -i -e "s/homer_user/$DB_USER/g" /usr/local/homer/etc/webapp_config.json sudo sed -i -e "s/homer_password/$DB_PASS/g" /usr/local/homer/etc/webapp_config.json sudo sed -i -e "s/localhost/127.0.0.1/g" /usr/local/homer/etc/webapp_config.json diff --git a/packer/jambonz-mini/template.json b/packer/jambonz-mini/template.json index b73500b..c62edee 100644 --- a/packer/jambonz-mini/template.json +++ b/packer/jambonz-mini/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz all-in-one AMI", "instance_type": "t2.xlarge", "drachtio_version": "v0.8.21", - "jambonz_version": "v0.8.2-rc3", + "jambonz_version": "v0.8.2-rc11", "jambonz_user": "admin", "jambonz_password": "JambonzR0ck$", "install_telegraf": "yes", @@ -17,7 +17,7 @@ "install_cloudwatch": "yes", "install_nodered": "no", "influxdb_ip": "127.0.0.1", - "rtp_engine_version": "mr11.2.1.2", + "rtp_engine_version": "mr11.2.1.5", "rtp_engine_min_port": "40000", "rtp_engine_max_port": "60000", "mediaserver_name" : "jambonz", @@ -151,11 +151,6 @@ "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `install_homer`}} {{user `influxdb_ip`}}", "script": "scripts/install_telegraf.sh" }, - { - "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `install_homer`}} {{user `homer_user`}} {{user `homer_password`}}", - "script": "scripts/install_homer.sh" - }, { "type": "shell", "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `install_influxdb`}}", @@ -180,6 +175,11 @@ "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `jambonz_version`}} {{user `jambonz_user`}} {{user `jambonz_password`}}", "script": "scripts/install_app.sh" }, + { + "type": "shell", + "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `install_homer`}} {{user `homer_user`}} {{user `homer_password`}}", + "script": "scripts/install_homer.sh" + }, { "type": "shell", "inline": [ diff --git a/packer/jambonz-monitoring/scripts/install_homer.sh b/packer/jambonz-monitoring/scripts/install_homer.sh index b0e3a38..77f2ee0 100644 --- a/packer/jambonz-monitoring/scripts/install_homer.sh +++ b/packer/jambonz-monitoring/scripts/install_homer.sh @@ -7,6 +7,7 @@ DB_PASS=$3 curl -s https://packagecloud.io/install/repositories/qxip/sipcapture/script.deb.sh | sudo bash sudo apt-get install -y homer-app heplify-server +sudo cp /usr/local/homer/etc/webapp_config.json.example /usr/local/homer/etc/webapp_config.json sudo sed -i -e "s/homer_user/$DB_USER/g" /usr/local/homer/etc/webapp_config.json sudo sed -i -e "s/homer_password/$DB_PASS/g" /usr/local/homer/etc/webapp_config.json sudo sed -i -e "s/localhost/127.0.0.1/g" /usr/local/homer/etc/webapp_config.json diff --git a/packer/jambonz-monitoring/template.json b/packer/jambonz-monitoring/template.json index e6b985a..57feb8d 100644 --- a/packer/jambonz-monitoring/template.json +++ b/packer/jambonz-monitoring/template.json @@ -4,7 +4,7 @@ "ssh_username": "admin", "ami_description": "jambonz monitoring server", "instance_type": "t2.xlarge", - "jambonz_version": "v0.8.2-rc3", + "jambonz_version": "v0.8.2-rc11", "homer_user": "homer_user", "homer_password": "XcapJTqy11LnsYRtxXGPTYQkAnI", "install_influxdb": "yes", diff --git a/packer/jambonz-sbc-rtp/template.json b/packer/jambonz-sbc-rtp/template.json index a325fe9..1613055 100644 --- a/packer/jambonz-sbc-rtp/template.json +++ b/packer/jambonz-sbc-rtp/template.json @@ -4,11 +4,11 @@ "ssh_username": "admin", "ami_description": "jambonz SBC RTP server", "drachtio_version": "v0.8.21", - "jambonz_version": "v0.8.2-rc3", + "jambonz_version": "v0.8.2-rc11", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "instance_type": "t3.xlarge", - "rtp_engine_version": "mr11.2.1.2", + "rtp_engine_version": "mr11.2.1.5", "rtp_engine_min_port": "40000", "rtp_engine_max_port": "60000", "install_datadog": "no", diff --git a/packer/jambonz-sbc-sip/template.json b/packer/jambonz-sbc-sip/template.json index 2639e58..60a8417 100644 --- a/packer/jambonz-sbc-sip/template.json +++ b/packer/jambonz-sbc-sip/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz SBC SIP", "instance_type": "t3.xlarge", "drachtio_version": "v0.8.21", - "jambonz_version": "v0.8.2-rc3", + "jambonz_version": "v0.8.2-rc11", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "install_datadog": "no", diff --git a/packer/jambonz-web-server/template.json b/packer/jambonz-web-server/template.json index de67d68..edeaaa7 100644 --- a/packer/jambonz-web-server/template.json +++ b/packer/jambonz-web-server/template.json @@ -4,7 +4,7 @@ "ssh_username": "admin", "ami_description": "jambonz webserver", "instance_type": "t3.xlarge", - "jambonz_version": "v0.8.2-rc3", + "jambonz_version": "v0.8.2-rc11", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "install_datadog": "no",