fix prev checkin: tls sg for teams was wrong

packer/jambonz-feature-server/scripts/install_drachtio.sh

@@ -8,7 +8,7 @@ cd /usr/local/src
 git clone https://github.com/davehorton/drachtio-server.git -b ${VERSION}
 cd drachtio-server
 git submodule update --init --recursive
-./autogen.sh && mkdir -p build && cd $_ && ../configure CPPFLAGS='-DNDEBUG' && make && sudo make install
+./autogen.sh && mkdir -p build && cd $_ && ../configure CPPFLAGS='-DNDEBUG' && make -j 4 && sudo make install
 sudo mv /tmp/drachtio.conf.xml /etc
 sudo mv /tmp/drachtio.service /etc/systemd/system
 sudo mv /tmp/vimrc.local /etc/vim/vimrc.local

packer/jambonz-feature-server/scripts/install_freeswitch.sh

@@ -24,7 +24,7 @@ sudo mkdir -p build && cd build && sudo cmake .. -DCMAKE_BUILD_TYPE=RelWithDebIn
 
 # build libfvad
 cd /usr/local/src/libfvad
-sudo autoreconf -i && sudo ./configure && sudo make && sudo make install
+sudo autoreconf -i && sudo ./configure && sudo make -j 4 && sudo make install
 
 # patch freeswitch
 # basic patches
@@ -60,7 +60,7 @@ cd grpc
 git submodule update --init --recursive
 cd third_party/protobuf && ./autogen.sh && ./configure && sudo make install
 cd /usr/local/src/grpc
-export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH && make && sudo make install 
+export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH && make -j 4 && sudo make install 
 
 # checkout and build googleapis
 echo "building googleapis"
@@ -68,14 +68,14 @@ cd /usr/local/src/freeswitch/libs
 git clone https://github.com/davehorton/googleapis -b dialogflow-v2-support
 cd googleapis
 git submodule update --init --recursive
-LANGUAGE=cpp make
+LANGUAGE=cpp make -j 4
 
 # build freeswitch
 echo "building freeswitch"
 cd /usr/local/src/freeswitch
 sudo ./bootstrap.sh -j
 sudo ./configure --with-lws=yes --with-grpc=yes
-sudo make
+sudo make -j 4
 sudo make install
 sudo make cd-sounds-install cd-moh-install
 sudo cp /tmp/acl.conf.xml /usr/local/freeswitch/conf/autoload_configs
@@ -96,8 +96,3 @@ sudo systemctl enable freeswitch
 sudo cp /tmp/freeswitch_log_rotation /etc/cron.daily/freeswitch_log_rotation
 sudo chown root:root /etc/cron.daily/freeswitch_log_rotation
 sudo chmod a+x /etc/cron.daily/freeswitch_log_rotation
-
-
-
-
-

packer/jambonz-feature-server/template.json

@@ -40,7 +40,7 @@
       "Name": "jambonz-feature-server"
     },
     "run_tags": {
-      "Name": "jambonz-feature-server"
+      "Name": "jambonz-feature-server-build"
     }
   }],
   "provisioners": [

packer/jambonz-sbc-rtp/template.json

@@ -41,7 +41,7 @@
       "Name": "jambonz-sbc-rtp"
     },
     "run_tags": {
-      "Name": "jambonz-sbc-rtp"
+      "Name": "jambonz-sbc-rtp-build"
     }
   }],
   "provisioners": [

packer/jambonz-sbc-sip-rtp/template.json

@@ -44,7 +44,7 @@
       "Name": "jambonz-sbc-sip-rtp"
     },
     "run_tags": {
-      "Name": "jambonz-sbc-sip-rtp"
+      "Name": "jambonz-sbc-sip-rtp-build"
     }
   }],
   "provisioners": [

packer/jambonz-sbc-sip/template.json

@@ -40,7 +40,7 @@
       "Name": "jambonz-sbc-sip"
     },
     "run_tags": {
-      "Name": "jambonz-sbc-sip"
+      "Name": "jambonz-sbc-sip-build"
     }
   }],
   "provisioners": [

terraform/jambonz-devtest/network.tf

@@ -131,9 +131,9 @@ resource "aws_security_group" "allow_jambonz_sbc_sip_rtp" {
 
   ingress {
     description = "sip tls for teams"
-    from_port   = 5060
-    to_port     = 5060
-    protocol    = "udp"
+    from_port   = 5061
+    to_port     = 5061
+    protocol    = "tcp"
     cidr_blocks = ["52.114.148.0/32", "52.114.132.46/32", "52.114.75.24/32", "52.114.76.76/32", "52.114.7.24/32", "52.114.14.70/32"]
   }
 

terraform/jambonz-prod/network.tf

@@ -139,9 +139,9 @@ resource "aws_security_group" "allow_jambonz_sbc_sip" {
 
   ingress {
     description = "sip tls for teams"
-    from_port   = 5060
-    to_port     = 5060
-    protocol    = "udp"
+    from_port   = 5061
+    to_port     = 5061
+    protocol    = "tcp"
     cidr_blocks = ["52.114.148.0/32", "52.114.132.46/32", "52.114.75.24/32", "52.114.76.76/32", "52.114.7.24/32", "52.114.14.70/32"]
   }