From 46dbb6ef325259c3de8188be02837b6500c6b653 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Wed, 15 Nov 2023 09:46:10 -0500 Subject: [PATCH] update to v0.8.5-2 jambonz --- cloudformation/jambonz-mini.yaml | 4 ++-- packer/jambonz-feature-server/aws/scripts/install_app.sh | 2 +- packer/jambonz-feature-server/aws/scripts/install_drachtio.sh | 2 +- packer/jambonz-feature-server/aws/template.json | 4 ++-- packer/jambonz-mini/aws/template-rhel-8.json | 2 +- packer/jambonz-mini/aws/template-rhel-9.json | 2 +- packer/jambonz-mini/aws/template.json | 2 +- packer/jambonz-mini/gcp/template.json | 4 ++-- packer/jambonz-mini/proxmox/template.json | 4 ++-- packer/jambonz-monitoring/aws/template.json | 2 +- packer/jambonz-sbc-rtp/aws/template.json | 2 +- packer/jambonz-sbc-sip-rtp/aws/template-rhel-8.json | 2 +- packer/jambonz-sbc-sip-rtp/aws/template-rhel-9.json | 2 +- packer/jambonz-sbc-sip-rtp/aws/template.json | 2 +- packer/jambonz-sbc-sip/aws/template-rhel.json | 2 +- packer/jambonz-sbc-sip/aws/template.json | 2 +- .../aws/template.json | 2 +- packer/jambonz-web-server/aws/template.json | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cloudformation/jambonz-mini.yaml b/cloudformation/jambonz-mini.yaml index a54d325..4ca4042 100644 --- a/cloudformation/jambonz-mini.yaml +++ b/cloudformation/jambonz-mini.yaml @@ -95,9 +95,9 @@ Conditions: Mappings: AWSRegion2AMI: us-east-1: - Ami: ami-056b03de9e4cc9e7b + Ami: ami-0525a66f4301a6e6d us-east-2: - Ami: ami-00970296c5d81f125 + Ami: ami-0e45caebe3e25580c Resources: IamCloudwatchRole: diff --git a/packer/jambonz-feature-server/aws/scripts/install_app.sh b/packer/jambonz-feature-server/aws/scripts/install_app.sh index d369439..a89bcfc 100755 --- a/packer/jambonz-feature-server/aws/scripts/install_app.sh +++ b/packer/jambonz-feature-server/aws/scripts/install_app.sh @@ -8,7 +8,7 @@ if [ "$DISTRO" == rhel* ]; then HOME=/home/ec2-user sed -i "s|/home/admin|${HOME}|g" /tmp/ecosystem.config.js else - HOME=$HOME + HOME=/home/admin cd $HOME fi diff --git a/packer/jambonz-feature-server/aws/scripts/install_drachtio.sh b/packer/jambonz-feature-server/aws/scripts/install_drachtio.sh index 02cced8..9a94491 100644 --- a/packer/jambonz-feature-server/aws/scripts/install_drachtio.sh +++ b/packer/jambonz-feature-server/aws/scripts/install_drachtio.sh @@ -10,7 +10,7 @@ cd /usr/local/src git clone https://github.com/drachtio/drachtio-server.git -b ${VERSION} cd drachtio-server git submodule update --init --recursive -./autogen.sh && mkdir -p build && cd $_ && ../configure --enable-tcmalloc=yes CPPFLAGS='-DNDEBUG -g -O2' && make -j 8 && sudo make install +./autogen.sh && mkdir -p build && cd $_ && ../configure --enable-tcmalloc=yes CPPFLAGS='-DNDEBUG -g -O2' && make -j 6 && sudo make install echo "installing drachtio for aws" diff --git a/packer/jambonz-feature-server/aws/template.json b/packer/jambonz-feature-server/aws/template.json index f391edf..a5f745a 100644 --- a/packer/jambonz-feature-server/aws/template.json +++ b/packer/jambonz-feature-server/aws/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz feature server", "instance_type": "c6in.xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "install_telegraf": "yes", @@ -119,7 +119,7 @@ }, { "type": "shell", - "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `install_telegraf`}}", + "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `distro`}} {{user `install_telegraf`}}", "script": "scripts/install_telegraf.sh" }, { diff --git a/packer/jambonz-mini/aws/template-rhel-8.json b/packer/jambonz-mini/aws/template-rhel-8.json index f6077f8..4fd2994 100644 --- a/packer/jambonz-mini/aws/template-rhel-8.json +++ b/packer/jambonz-mini/aws/template-rhel-8.json @@ -5,7 +5,7 @@ "ami_description": "jambonz all-in-one AMI", "instance_type": "c6in.2xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "jambonz_user": "admin", "jambonz_password": "JambonzR0ck$", "ami_base_image_owner": "309956199498", diff --git a/packer/jambonz-mini/aws/template-rhel-9.json b/packer/jambonz-mini/aws/template-rhel-9.json index 538af19..b169385 100644 --- a/packer/jambonz-mini/aws/template-rhel-9.json +++ b/packer/jambonz-mini/aws/template-rhel-9.json @@ -5,7 +5,7 @@ "ami_description": "jambonz all-in-one AMI", "instance_type": "c6in.2xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "jambonz_user": "admin", "jambonz_password": "JambonzR0ck$", "ami_base_image_owner": "309956199498", diff --git a/packer/jambonz-mini/aws/template.json b/packer/jambonz-mini/aws/template.json index 80206fd..23671a0 100644 --- a/packer/jambonz-mini/aws/template.json +++ b/packer/jambonz-mini/aws/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz all-in-one AMI", "instance_type": "c6in.xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "jambonz_user": "admin", "jambonz_password": "JambonzR0ck$", "install_telegraf": "yes", diff --git a/packer/jambonz-mini/gcp/template.json b/packer/jambonz-mini/gcp/template.json index 8e1bc34..3859e47 100644 --- a/packer/jambonz-mini/gcp/template.json +++ b/packer/jambonz-mini/gcp/template.json @@ -8,8 +8,8 @@ "ssh_username": "admin", "ami_description": "jambonz-mini (all-in-one server)", "instance_type": "c2-standard-4", - "drachtio_version": "v0.8.22", - "jambonz_version": "v0.8.4-4", + "drachtio_version": "v0.8.24", + "jambonz_version": "v0.8.5-2", "jambonz_user": "admin", "jambonz_password": "JambonzR0ck$", "install_telegraf": "yes", diff --git a/packer/jambonz-mini/proxmox/template.json b/packer/jambonz-mini/proxmox/template.json index 31a7c8e..0e36166 100644 --- a/packer/jambonz-mini/proxmox/template.json +++ b/packer/jambonz-mini/proxmox/template.json @@ -15,8 +15,8 @@ "proxmox_ip_public": "{{user `proxmox_ip_public`}}", "proxmox_ip_private": "{{user `proxmox_ip_private`}}", "proxmox_gateway": "{{user `proxmox_gateway`}}", - "drachtio_version": "v0.8.22", - "jambonz_version": "v0.8.4-4", + "drachtio_version": "v0.8.24", + "jambonz_version": "v0.8.5-2", "jambonz_user": "admin", "jambonz_password": "JambonzR0ck$", "install_telegraf": "yes", diff --git a/packer/jambonz-monitoring/aws/template.json b/packer/jambonz-monitoring/aws/template.json index 2d336e2..9c98672 100644 --- a/packer/jambonz-monitoring/aws/template.json +++ b/packer/jambonz-monitoring/aws/template.json @@ -4,7 +4,7 @@ "ssh_username": "admin", "ami_description": "jambonz monitoring server", "instance_type": "t2.xlarge", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "homer_user": "homer_user", "homer_password": "XcapJTqy11LnsYRtxXGPTYQkAnI", "install_influxdb": "yes", diff --git a/packer/jambonz-sbc-rtp/aws/template.json b/packer/jambonz-sbc-rtp/aws/template.json index a097477..a4a3413 100644 --- a/packer/jambonz-sbc-rtp/aws/template.json +++ b/packer/jambonz-sbc-rtp/aws/template.json @@ -4,7 +4,7 @@ "ssh_username": "admin", "ami_description": "jambonz SBC RTP server", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "instance_type": "t3.xlarge", diff --git a/packer/jambonz-sbc-sip-rtp/aws/template-rhel-8.json b/packer/jambonz-sbc-sip-rtp/aws/template-rhel-8.json index 83b721f..6376cca 100644 --- a/packer/jambonz-sbc-sip-rtp/aws/template-rhel-8.json +++ b/packer/jambonz-sbc-sip-rtp/aws/template-rhel-8.json @@ -6,7 +6,7 @@ "ami_description": "jambonz SBC SIP+RTP", "instance_type": "c6in.xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "309956199498", "rtp_engine_version": "mr11.5.1.1", diff --git a/packer/jambonz-sbc-sip-rtp/aws/template-rhel-9.json b/packer/jambonz-sbc-sip-rtp/aws/template-rhel-9.json index d83036c..ce5d8d3 100644 --- a/packer/jambonz-sbc-sip-rtp/aws/template-rhel-9.json +++ b/packer/jambonz-sbc-sip-rtp/aws/template-rhel-9.json @@ -6,7 +6,7 @@ "ami_description": "jambonz SBC SIP+RTP", "instance_type": "c6in.xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "309956199498", "rtp_engine_version": "mr11.5.1.1", diff --git a/packer/jambonz-sbc-sip-rtp/aws/template.json b/packer/jambonz-sbc-sip-rtp/aws/template.json index b4c8a73..965dac2 100644 --- a/packer/jambonz-sbc-sip-rtp/aws/template.json +++ b/packer/jambonz-sbc-sip-rtp/aws/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz SBC SIP+RTP", "instance_type": "c6in.2xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "rtp_engine_version": "mr11.5.1.1", diff --git a/packer/jambonz-sbc-sip/aws/template-rhel.json b/packer/jambonz-sbc-sip/aws/template-rhel.json index 93ae291..269346c 100644 --- a/packer/jambonz-sbc-sip/aws/template-rhel.json +++ b/packer/jambonz-sbc-sip/aws/template-rhel.json @@ -5,7 +5,7 @@ "ami_description": "jambonz SBC SIP", "instance_type": "t3.xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "309956199498", "install_datadog": "no", diff --git a/packer/jambonz-sbc-sip/aws/template.json b/packer/jambonz-sbc-sip/aws/template.json index 3c37862..aaa647a 100644 --- a/packer/jambonz-sbc-sip/aws/template.json +++ b/packer/jambonz-sbc-sip/aws/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz SBC SIP", "instance_type": "t3.xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "install_datadog": "no", diff --git a/packer/jambonz-web-server-and-monitoring-server/aws/template.json b/packer/jambonz-web-server-and-monitoring-server/aws/template.json index 28a69b0..2819a7e 100644 --- a/packer/jambonz-web-server-and-monitoring-server/aws/template.json +++ b/packer/jambonz-web-server-and-monitoring-server/aws/template.json @@ -4,7 +4,7 @@ "ssh_username": "admin", "ami_description": "jambonz web+monitoring server", "instance_type": "t3.xlarge", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_arch": "amd64", "ami_base_image_owner": "136693071363", "install_datadog": "no", diff --git a/packer/jambonz-web-server/aws/template.json b/packer/jambonz-web-server/aws/template.json index 9d53cf6..3182a8e 100644 --- a/packer/jambonz-web-server/aws/template.json +++ b/packer/jambonz-web-server/aws/template.json @@ -5,7 +5,7 @@ "ami_description": "jambonz webserver", "instance_type": "t3.xlarge", "drachtio_version": "v0.8.24", - "jambonz_version": "v0.8.5", + "jambonz_version": "v0.8.5-2", "ami_base_image_owner": "136693071363", "install_datadog": "no", "install_cloudwatch": "yes",