diff --git a/README.md b/README.md index 15bfc89..b8faadb 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # Saycel.Phone -_THIS IS A WORK IN PROGRESS_ +_THIS IS A STABLE 1.0 branch_ _Pull Requests Welcome_ **Intro** -This is a WebApp for connecting internet enabled devices to community -cellular networks. The principle behind this docker implementation is -the ability for easy distribution and setup for users. Each docker -container is a seperate piece of the application, with each connecting -to eachother locally over the internal network of the host (localhost). - +This is v1.0 of the application on the MASTER branch. This branch +allows you to make SIP calls from your domain. The principle behind +this docker implementation is the ability for easy distribution and +setup for users. Each docker container is a seperate piece of the +application, with each connecting to eachother locally over the +internal network of the host (localhost). **Uses** @@ -41,7 +41,7 @@ changed in the future once stable._ > cd Saycel.Phone/ -> git checkout testing +> git checkout v1.0 You will need to modify the following files with your Domain diff --git a/docker-compose.yml b/docker-compose.yml index d8df18f..81a737f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,11 +58,3 @@ services: - "443" environment: - VIRTUAL_HOST=${DOMAIN} - rtpengine: - build: ./rtpengine - image: saycel/rtpengine:latest - container_name: rtpengine - hostname: rtpengine - ports: - - "2223:2223/udp" - - "30000-31000:30000-31000/udp" diff --git a/rtpengine/.env b/rtpengine/.env deleted file mode 100644 index e69de29..0000000 diff --git a/rtpengine/Dockerfile b/rtpengine/Dockerfile deleted file mode 100644 index 970fa66..0000000 --- a/rtpengine/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM saycel/rtpengine:latest - -ADD rtpengine.conf /etc/rtpengine/rtpengine.conf - -ADD ngcp-rtpengine-daemon /etc/default/ngcp-rtpengine-daemon - -ADD run.sh / - -RUN chmod +x /run.sh - -ENTRYPOINT ["/run.sh"] diff --git a/rtpengine/ngcp-rtpengine-daemon b/rtpengine/ngcp-rtpengine-daemon deleted file mode 100644 index dff5613..0000000 --- a/rtpengine/ngcp-rtpengine-daemon +++ /dev/null @@ -1,5 +0,0 @@ -RUN_RTPENGINE=yes -CONFIG_FILE=/etc/rtpengine/rtpengine.conf -# CONFIG_SECTION=rtpengine -PIDFILE=/var/run/ngcp-rtpengine-daemon.pid -TABLE=0 diff --git a/rtpengine/rtpengine.conf b/rtpengine/rtpengine.conf deleted file mode 100644 index dd3eed2..0000000 --- a/rtpengine/rtpengine.conf +++ /dev/null @@ -1,72 +0,0 @@ -[rtpengine] - -table = 0 -# no-fallback = false -### for userspace forwarding only: -# table = -1 - -### a single interface: -# interface = 123.234.345.456 -interface = 138.68.99.252 -### separate multiple interfaces with semicolons: -# interface = internal/12.23.34.45;external/23.34.45.54 -### for different advertised address: -# interface = 12.23.34.45!23.34.45.56 - - - -listen-ng = 127.0.0.1:2223 -# listen-tcp = 25060 -# listen-udp = 12222 - -timeout = 60 -silent-timeout = 3600 -tos = 184 -# delete-delay = 30 -# final-timeout = 10800 - -# foreground = false -# pidfile = /var/run/ngcp-rtpengine-daemon.pid -# num-threads = 16 - -port-min = 30000 -port-max = 31000 #originally 50000 -# max-sessions = 5000 - -# recording-dir = /var/spool/rtpengine -# recording-method = proc -# recording-format = raw - -# redis = 127.0.0.1:6379/5 -# redis-write = password@12.23.34.45:6379/42 -# redis-num-threads = 8 -# no-redis-required = false -# redis-expires = 86400 - -# b2b-url = http://127.0.0.1:8090/ -# xmlrpc-format = 0 - -# log-level = 6 -# log-stderr = false -# log-facility = daemon -# log-facility-cdr = local0 -# log-facility-rtcp = local1 - -# graphite = 127.0.0.1:9006 -# graphite-interval = 60 -# graphite-prefix = foobar. - -# homer = 123.234.345.456:65432 -# homer-protocol = udp -# homer-id = 2001 - -# sip-source = false -# dtls-passive = false - -[rtpengine-testing] -table = -1 -interface = 10.15.20.121 -listen-ng = 2223 -foreground = true -log-stderr = true -log-level = 7 diff --git a/rtpengine/run.sh b/rtpengine/run.sh deleted file mode 100644 index cdde5bb..0000000 --- a/rtpengine/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash -rtpengine_ip=$(ping -c 1 rtpengine) -rtpengine_ip_1=$(awk -F')' '{print $1}' <<< $rtpengine_ip) -rtpengine_ip_2=$(awk -F'(' '{print $2}' <<< $rtpengine_ip_1) -sed -i "s/138.68.99.252/$rtpengine_ip_2/g" /etc/rtpengine/rtpengine.conf -sed -i "s/127.0.0.1:2223/2223/g" /etc/rtpengine/rtpengine.conf -service ngcp-rtpengine-daemon start -tail -f /dev/null