updates for v0.6.7

2026-01-25 02:08:27 +00:00 · 2021-11-29 14:02:00 -05:00
parent 3a0818a5ec
commit 7fce4e3368
19 changed files with 116 additions and 99 deletions
--- a/cloudformation/jambonz-mini.yaml
+++ b/cloudformation/jambonz-mini.yaml
@@ -52,10 +52,18 @@ Parameters:
    ConstraintDescription: must be a valid network CIDR
    AllowedPattern: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d{1,2}
    Default: 0.0.0.0/0
+  VpcCidr:
+    Description: CIDR range for the VPC.
+    Type: String
+    ConstraintDescription: must be a valid network CIDR
+    AllowedPattern: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d{1,2}
+    Default: 10.0.0.0/16
 Mappings:
  AWSRegion2AMI:
    us-east-1:
-      Ami: ami-376029039784
+      Ami: ami-01c840e45dc7fa298
+    us-east-2:
+      Ami: ami-05e57bc7ff0fe0d34

 Resources:
  VPC:
@@ -63,12 +71,12 @@ Resources:
    Properties:
      EnableDnsSupport: true
      EnableDnsHostnames: true
-      CidrBlock: 10.0.0.0/16
+      CidrBlock: !Ref VpcCidr
  PublicSubnet:
    Type: 'AWS::EC2::Subnet'
    Properties:
      VpcId: !Ref VPC
-      CidrBlock: 10.0.0.0/24
+      CidrBlock: !Ref VpcCidr
  jambonzInstance:
    Type: 'AWS::EC2::Instance'
    Properties:
@@ -78,6 +86,7 @@ Resources:
      NetworkInterfaces:
        - GroupSet:
            - !Ref jambonzSecurityGroup
+            - !Ref sshSecurityGroup
          AssociatePublicIpAddress: true
          DeviceIndex: '0'
          DeleteOnTermination: true
@@ -124,6 +133,8 @@ Resources:
            - >
              sudo -u admin bash -c "pm2 restart
              /home/admin/apps/ecosystem.config.js" 
+            - >
+              sudo env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u admin --hp /home/admin
            - >
              sudo systemctl restart heplify-server
            - |+
@@ -164,6 +175,19 @@ Resources:
          FromPort: 3000
          ToPort: 3000
          CidrIp: !Ref AllowedHttpCidr
+        - Description: smpp
+          IpProtocol: tcp
+          FromPort: 3020
+          ToPort: 3020
+          CidrIp: !Ref VpcCidr
+    DependsOn:
+      - PublicRoute
+  sshSecurityGroup:
+    Type: 'AWS::EC2::SecurityGroup'
+    Properties:
+      VpcId: !Ref VPC
+      GroupDescription: 'Allow sip, rtp, http and ssh access'
+      SecurityGroupIngress:
        - Description: ssh
          IpProtocol: tcp
          FromPort: 22
--- a/packer/jambonz-feature-server/files/SpeechSDK-Linux-1.19.0.tar.gz
+++ b/packer/jambonz-feature-server/files/SpeechSDK-Linux-1.19.0.tar.gz
--- a/packer/jambonz-feature-server/files/configure.ac.extra
+++ b/packer/jambonz-feature-server/files/configure.ac.extra
@@ -1891,6 +1891,7 @@ AC_CONFIG_FILES([Makefile
    src/mod/applications/mod_audio_fork/Makefile
    src/mod/applications/mod_aws_lex/Makefile
    src/mod/applications/mod_aws_transcribe/Makefile
+    src/mod/applications/mod_azure_transcribe/Makefile
    src/mod/applications/mod_google_tts/Makefile
    src/mod/applications/mod_google_transcribe/Makefile
    src/mod/applications/mod_dialogflow/Makefile
--- a/packer/jambonz-feature-server/files/modules.conf.in.extra
+++ b/packer/jambonz-feature-server/files/modules.conf.in.extra
@@ -1,6 +1,7 @@
 applications/mod_audio_fork
 applications/mod_aws_lex
 applications/mod_aws_transcribe
+applications/mod_azure_transcribe
 applications/mod_google_tts
 applications/mod_google_transcribe
 applications/mod_dialogflow
--- a/packer/jambonz-feature-server/files/modules.conf.vanilla.xml.extra
+++ b/packer/jambonz-feature-server/files/modules.conf.vanilla.xml.extra
@@ -3,6 +3,7 @@
    <load module="mod_audio_fork"/>
    <load module="mod_aws_lex"/>
    <load module="mod_aws_transcribe"/>
+    <load module="mod_azure_transcribe"/>
    <load module="mod_google_transcribe"/>
    <load module="mod_google_tts"/>
    <load module="mod_dialogflow"/>
--- a/packer/jambonz-feature-server/scripts/install_freeswitch.sh
+++ b/packer/jambonz-feature-server/scripts/install_freeswitch.sh
@@ -6,7 +6,7 @@ GRPC_VERSION=c66d2cc
 GOOGLE_API_VERSION=e9da6f8b469c52b83f900e820be30762e9e05c57
 AWS_SDK_VERSION=1.8.129
 LWS_VERSION=v3.2.3
-MODULES_VERSION=v0.4.0
+MODULES_VERSION=v0.5.0

 echo "freeswitch version to install is ${FREESWITCH_VERSION}"
 echo "drachtio modules version to install is ${MODULES_VERSION}"
@@ -17,6 +17,15 @@ echo "LWS_VERSION version to install is ${LWS_VERSION}"

 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

+cd /tmp
+tar xvfz SpeechSDK-Linux-1.19.0.tar.gz
+cd SpeechSDK-Linux-1.19.0
+sudo cp -r include /usr/local/include/MicrosoftSpeechSDK
+sudo cp -r lib/ /usr/local/lib/MicrosoftSpeechSDK
+cd
+rm -Rf /tmp/SpeechSDK-Linux-1.19.0
+rm -Rf /tmp/SpeechSDK-Linux-1.19.0.tar.gz
+
 git config --global pull.rebase true
 cd /usr/local/src
 git clone https://github.com/signalwire/freeswitch.git -b ${FREESWITCH_VERSION}
@@ -37,6 +46,7 @@ git clone https://github.com/awslabs/aws-c-common.git

 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_audio_fork /usr/local/src/freeswitch/src/mod/applications/mod_audio_fork
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_aws_transcribe /usr/local/src/freeswitch/src/mod/applications/mod_aws_transcribe
+sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_azure_transcribe /usr/local/src/freeswitch/src/mod/applications/mod_azure_transcribe
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_aws_lex /usr/local/src/freeswitch/src/mod/applications/mod_aws_lex
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_google_transcribe /usr/local/src/freeswitch/src/mod/applications/mod_google_transcribe
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_google_tts /usr/local/src/freeswitch/src/mod/applications/mod_google_tts
--- a/packer/jambonz-feature-server/template.json
+++ b/packer/jambonz-feature-server/template.json
@@ -4,8 +4,8 @@
    "ssh_username": "admin",
    "ami_description": "jambonz feature server", 
    "instance_type": "t2.xlarge",
-    "drachtio_version": "v0.8.12",
-    "jambonz_version": "v0.6.7-rc4",
+    "drachtio_version": "v0.8.13-rc1",
+    "jambonz_version": "v0.6.7-rc7",
    "install_telegraf": "yes",
    "install_datadog": "no"
  },
--- a/packer/jambonz-mini/files/SpeechSDK-Linux-1.19.0.tar.gz
+++ b/packer/jambonz-mini/files/SpeechSDK-Linux-1.19.0.tar.gz
--- a/packer/jambonz-mini/files/ecosystem.config.js
+++ b/packer/jambonz-mini/files/ecosystem.config.js
@@ -269,8 +269,6 @@ module.exports = {
    max_memory_restart: '1G',
    env: {
      NODE_ENV: 'production',
-      GOOGLE_APPLICATION_CREDENTIALS: '/home/admin/credentials/gcp.json',
-      AWS_REGION: 'AWS_REGION_HERE',
      ENABLE_METRICS: 1,
      STATS_HOST: '127.0.0.1',
      STATS_PORT: 8125,
@@ -291,7 +289,58 @@ module.exports = {
      DRACHTIO_PORT: 9023,
      DRACHTIO_SECRET: 'cymru',
      JAMBONES_SBCS: 'PRIVATE_IP',
-      JAMBONES_FREESWITCH: '127.0.0.1:8021:JambonzR0ck$'
+      JAMBONES_FREESWITCH: '127.0.0.1:8021:JambonzR0ck$',
+      SMPP_URL: 'http://PRIVATE_IP:3020'
+    }
+  },
+  {
+    name: 'jambonz-smpp-esme',
+    cwd: '/home/admin/apps/jambonz-smpp-esme',
+    script: 'app.js',
+    out_file: '/home/admin/.pm2/logs/jambonz-smpp-esme.log',
+    err_file: '/home/admin/.pm2/logs/jambonz-smpp-esme.log',
+    combine_logs: true,
+    instance_var: 'INSTANCE_ID',
+    exec_mode: 'fork',
+    instances: 1,
+    autorestart: true,
+    watch: false,
+    max_memory_restart: '1G',
+    env: {
+      NODE_ENV: 'production',
+      JAMBONES_LOGLEVEL: 'info',
+      HTTP_PORT: 3020,
+      AVOID_UDH: true,
+      JAMBONES_MYSQL_HOST: '127.0.0.1',
+      JAMBONES_MYSQL_USER: 'admin',
+      JAMBONES_MYSQL_PASSWORD: 'JambonzR0ck$',
+      JAMBONES_MYSQL_DATABASE: 'jambones',
+      JAMBONES_MYSQL_CONNECTION_LIMIT: 10,
+      JAMBONES_REDIS_HOST: '127.0.0.1',
+      JAMBONES_REDIS_PORT: 6379
+    }
+  },
+  {
+    name: 'sbc-rtpengine-sidecar',
+    cwd: '/home/admin/apps/sbc-rtpengine-sidecar',
+    script: 'app.js',
+    instance_var: 'INSTANCE_ID',
+    out_file: '/home/admin/.pm2/logs/jambonz-sbc-rtpengine-sidecar.log',
+    err_file: '/home/admin/.pm2/logs/jambonz-sbc-rtpengine-sidecar.log',
+    exec_mode: 'fork',
+    instances: 1,
+    autorestart: true,
+    watch: false,
+    max_memory_restart: '1G',
+    env: {
+      NODE_ENV: 'production',
+      LOGLEVEL: 'info',
+      DTMF_ONLY: true,
+      ENABLE_METRICS: 1,
+      STATS_HOST: '127.0.0.1',
+      STATS_PORT: 8125,
+      STATS_PROTOCOL: 'tcp',
+      STATS_TELEGRAF: 1
    }
  }
 ]
--- a/packer/jambonz-mini/files/td-agent-bit.conf
+++ b/packer/jambonz-mini/files/td-agent-bit.conf
@@ -1,48 +0,0 @@
-[SERVICE]
-    # Flush
-    # =====
-    # Set an interval of seconds before to flush records to a destination
-    Flush        5
-
-    # Daemon
-    # ======
-    # Instruct Fluent Bit to run in foreground or background mode.
-    Daemon       Off
-
-    # Log_Level
-    # =========
-    # Set the verbosity level of the service, values can be:
-    #
-    # - error
-    # - warning
-    # - info
-    # - debug
-    # - trace
-    #
-    # By default 'info' is set, that means it includes 'error' and 'warning'.
-    Log_Level    warning
-
-    # Parsers_File
-    # ============
-    # Specify an optional 'Parsers' configuration file
-    Parsers_File parsers.conf
-    Plugins_File plugins.conf
-
-    # HTTP Server
-    # ===========
-    # Enable/Disable the built-in HTTP Server for metrics
-    HTTP_Server  Off
-    HTTP_Listen  0.0.0.0
-    HTTP_Port    2020
-
-[INPUT]
-    Tag         media-gateway
-    Name        tail
-    Path        /home/admin/.pm2/logs/mg-siprec-out-*.log
-    parser      docker
-
-[OUTPUT]
-    Name        forward
-    Host        lima-prod-pci-logs.pci.asapp.com
-    Port        443
-    tls         on
--- a/packer/jambonz-mini/scripts/install_datadog.sh
+++ b/packer/jambonz-mini/scripts/install_datadog.sh
@@ -1,19 +0,0 @@
-#!/bin/bash
-DATADOG_API_KEY=$1
-DATADOG_ENDPOINT=$2
-DATADOG_ENV_NAME=$3
-
-# install datadog
-DD_INSTALL_ONLY=true DD_API_KEY=${DATADOG_API_KEY} bash -c "$(curl -L https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh)"
-sudo rm /etc/datadog-agent/conf.d/*
-
-sudo sed -i -e 's@^# dd_url:.*@'"dd_url: $DATADOG_ENDPOINT"'@g' /etc/datadog-agent/datadog.yaml
-sudo sed -i -e 's@^# log_level:.*@log_level: warning@g' /etc/datadog-agent/datadog.yaml
-
-sudo tee -a /etc/datadog-agent/datadog.yaml > /dev/null <<EOT
-tags:
-  env_name:$DATADOG_ENV_NAME
-  role:jambonz-feature-server
-EOT
-
-systemctl enable datadog-agent
--- a/packer/jambonz-mini/scripts/install_fluent_bit.sh
+++ b/packer/jambonz-mini/scripts/install_fluent_bit.sh
@@ -1,12 +0,0 @@
-#!/bin/bash
-FLUENTD_ENDPOINT=$1
-
-wget -qO - https://packages.fluentbit.io/fluentbit.key | sudo apt-key add -
-echo "deb https://packages.fluentbit.io/debian/stretch stretch main" | sudo tee -a /etc/apt/sources.list
-sudo apt-get update
-sudo apt-get install td-agent-bit
-sudo mv /tmp/td-agent-bit.conf /etc/td-agent-bit
-
-sudo sed -i -e 's!\(^.*Host\).*!'"\1         $FLUENTD_ENDPOINT"'!g' /etc/td-agent-bit/td-agent-bit.conf
-systemctl daemon-reload
-systemctl enable td-agent-bit
--- a/packer/jambonz-mini/scripts/install_freeswitch.sh
+++ b/packer/jambonz-mini/scripts/install_freeswitch.sh
@@ -6,7 +6,7 @@ GRPC_VERSION=c66d2cc
 GOOGLE_API_VERSION=e9da6f8b469c52b83f900e820be30762e9e05c57
 AWS_SDK_VERSION=1.8.129
 LWS_VERSION=v3.2.3
-MODULES_VERSION=v0.4.0
+MODULES_VERSION=v0.5.0

 echo "freeswitch version to install is ${FREESWITCH_VERSION}"
 echo "drachtio modules version to install is ${MODULES_VERSION}"
@@ -17,6 +17,15 @@ echo "LWS_VERSION version to install is ${LWS_VERSION}"

 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

+cd /tmp
+tar xvfz SpeechSDK-Linux-1.19.0.tar.gz
+cd SpeechSDK-Linux-1.19.0
+sudo cp -r include /usr/local/include/MicrosoftSpeechSDK
+sudo cp -r lib/ /usr/local/lib/MicrosoftSpeechSDK
+cd
+rm -Rf /tmpSpeechSDK-Linux-1.19.0
+rm -Rf /tmpSpeechSDK-Linux-1.19.0.tar.gz
+
 git config --global pull.rebase true
 cd /usr/local/src
 git clone https://github.com/signalwire/freeswitch.git -b ${FREESWITCH_VERSION}
@@ -37,6 +46,7 @@ git clone https://github.com/awslabs/aws-c-common.git

 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_audio_fork /usr/local/src/freeswitch/src/mod/applications/mod_audio_fork
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_aws_transcribe /usr/local/src/freeswitch/src/mod/applications/mod_aws_transcribe
+sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_azure_transcribe /usr/local/src/freeswitch/src/mod/applications/mod_azure_transcribe
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_aws_lex /usr/local/src/freeswitch/src/mod/applications/mod_aws_lex
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_google_transcribe /usr/local/src/freeswitch/src/mod/applications/mod_google_transcribe
 sudo cp -r /usr/local/src/drachtio-freeswitch-modules/modules/mod_google_tts /usr/local/src/freeswitch/src/mod/applications/mod_google_tts
--- a/packer/jambonz-mini/template.json
+++ b/packer/jambonz-mini/template.json
@@ -4,8 +4,8 @@
    "ssh_username": "admin",
    "ami_description": "jambonz all-in-one AMI", 
    "instance_type": "t2.xlarge",
-    "drachtio_version": "v0.8.12",
-    "jambonz_version": "v0.6.7-rc4",
+    "drachtio_version": "v0.8.13-rc1",
+    "jambonz_version": "v0.6.7-rc7",
    "jambonz_user": "admin",
    "jambonz_password": "JambonzR0ck$",
    "install_telegraf": "yes",
--- 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.medium",
-    "jambonz_version": "v0.6.7-rc4",
+    "jambonz_version": "v0.6.7-rc7",
    "homer_user": "homer_user",
    "homer_password": "XcapJTqy11LnsYRtxXGPTYQkAnI",
    "install_influxdb":  "yes",
--- a/packer/jambonz-sbc-rtp/template.json
+++ b/packer/jambonz-sbc-rtp/template.json
@@ -3,8 +3,8 @@
    "region": "us-east-1",
    "ssh_username": "admin",
    "ami_description": "jambonz SBC media server", 
-    "drachtio_version": "v0.8.12",
-    "jambonz_version": "v0.6.7-rc4",
+    "drachtio_version": "v0.8.13-rc1",
+    "jambonz_version": "v0.6.7-rc7",
    "instance_type": "t2.medium",
    "rtp_engine_version": "mr10.0.1.4",
    "rtp_engine_min_port": "40000",
--- a/packer/jambonz-sbc-sip-rtp/template.json
+++ b/packer/jambonz-sbc-sip-rtp/template.json
@@ -3,8 +3,8 @@
    "region": "us-east-1",
    "ssh_username": "admin",
    "ami_description": "jambonz SBC SIP+RTP+Webserver+monitoring", 
-    "drachtio_version": "v0.8.11",
-    "jambonz_version": "v0.6.7-rc3",
+    "drachtio_version": "v0.8.13-rc1",
+    "jambonz_version": "v0.6.7-rc7",
    "install_influxdb":  "yes",
    "install_homer":  "yes",
    "homer_user": "homer_user",
--- a/packer/jambonz-sbc-sip/template.json
+++ b/packer/jambonz-sbc-sip/template.json
@@ -4,8 +4,8 @@
    "ssh_username": "admin",
    "ami_description": "jambonz SBC SIP", 
    "instance_type": "t2.medium",
-    "drachtio_version": "v0.8.12",
-    "jambonz_version": "v0.6.7-rc4",
+    "drachtio_version": "v0.8.13-rc1",
+    "jambonz_version": "v0.6.7-rc7",
    "install_datadog": "no",
    "install_telegraf": "yes"
  },
--- 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": "t2.medium",
-    "jambonz_version": "v0.6.7-rc4",
+    "jambonz_version": "v0.6.7-rc7",
    "install_datadog": "no",
    "install_telegraf": "yes"
  },