From e0554a02983a50869dacf99edf47271d60c61e2c Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Fri, 3 Sep 2021 13:55:35 -0400
Subject: [PATCH] fix version of drachtio modules to build

---
 .../scripts/install_freeswitch.sh                      |  5 +++--
 packer/jambonz-feature-server/template.json            | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packer/jambonz-feature-server/scripts/install_freeswitch.sh b/packer/jambonz-feature-server/scripts/install_freeswitch.sh
index 3a0b3e4..e63cd1d 100644
--- a/packer/jambonz-feature-server/scripts/install_freeswitch.sh
+++ b/packer/jambonz-feature-server/scripts/install_freeswitch.sh
@@ -4,6 +4,7 @@ GRPC_VERSION=v1.24.2
 GOOGLE_API_VERSION=v1p1beta1-speech
 AWS_SDK_VERSION=1.8.129
 LWS_VERSION=v3.2.3
+DRACHTIO_MODULES_VERSION=v0.3.3
 
 echo "freeswitch version to install is ${VERSION}"
 echo "GRPC version to install is ${GRPC_VERSION}"
@@ -15,7 +16,7 @@ git config --global pull.rebase true
 cd /usr/local/src
 git clone https://github.com/signalwire/freeswitch.git -b ${VERSION}
 git clone https://github.com/warmcat/libwebsockets.git -b ${LWS_VERSION}
-git clone https://github.com/drachtio/drachtio-freeswitch-modules.git -b master
+git clone https://github.com/drachtio/drachtio-freeswitch-modules.git -b ${DRACHTIO_MODULES_VERSION}
 git clone https://github.com/grpc/grpc -b ${GRPC_VERSION}
 
 cd freeswitch/libs
@@ -42,7 +43,7 @@ cd /usr/local/src/libwebsockets
 sudo mkdir -p build && cd build && sudo cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo && sudo make && sudo make install
 
 # build libfvad
-cd /usr/local/src/libfvad
+cd /usr/local/src/freeswitch/libs/libfvad
 sudo autoreconf -i && sudo ./configure && sudo make -j 4 && sudo make install
 
 # build spandsp
diff --git a/packer/jambonz-feature-server/template.json b/packer/jambonz-feature-server/template.json
index 28f2f10..9ce0557 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.10",
-    "jambonz_version": "v0.6.3",
+    "jambonz_version": "v0.5-branch",
     "install_telegraf": "yes",
     "install_datadog": "no"
   },
@@ -77,6 +77,10 @@
       "type": "shell",
       "script": "scripts/install_chrony.sh"
     },
+    {
+      "type": "shell",
+      "script": "scripts/install_freeswitch.sh"
+    },
     {
       "type": "shell",
       "script": "scripts/install_nodejs.sh"
@@ -91,10 +95,6 @@
       "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `install_telegraf`}}",
       "script": "scripts/install_telegraf.sh"
     },
-    {
-      "type": "shell",
-      "script": "scripts/install_freeswitch.sh"
-    },
     {
       "type": "shell",
       "execute_command": "chmod +x {{ .Path }}; sudo '{{ .Path }}' {{user `drachtio_version`}}",