manual merge and backport of pull #20 adding an accounting role

Conflicts:
	kamailio/kamailio.cfg
	system/logrotate.d/2600hz-platform.conf
	system/logrotate.d/bigcouch.conf
	system/logrotate.d/kamailio.conf

config.ini

@@ -1,53 +1,25 @@
 ; section are between [] = [section]
 ; key = value
 ; to comment add ";" in front of the line
-;
-;
-; NOTE: You must add all your FreeSWITCH servers to the trusted ACLs
-;    if you are using zones!
-;
+[amqp]
+uri = "amqp://guest:guest@127.0.0.1:5672"
+
 [bigcouch]
 compact_automatically = true
 cookie = change_me
 ip = "127.0.0.1"
 port = 15984
-;username = "kazoo"
-;password = "supermegaexcellenttelephonyplatform"
+; username = "kazoo"
+; password = "supermegaexcellenttelephonyplatform"
 admin_port = 15986
 
-; Define your AMQPs and zones here
-[zone]
-name = zone_1
-amqp_uri = "amqp://guest:guest@127.0.0.1:5672"
-
-;[zone]
-;name = zone_2
-;amqp_uri = "amqp://guest:guest@127.0.0.2:5672"
-
-; Define your whistles here
 [whistle_apps]
-;host = apps001.2600hz.com
-zone = zone_1
 cookie = change_me
 
-;[whistle_apps]
-;host = apps002.2600hz.com
-;zone = zone_2
-;cookie = change_me
-
-; Define your ecallmgr's here
 [ecallmgr]
-;host = apps001.2600hz.com
-zone = zone_1
 cookie = change_me
 
-;[ecallmgr]
-;host = apps002.2600hz.com
-;zone = zone_2
-;cookie = change_me
-
 [log]
-syslog = debug
+syslog = info
 console = notice
 file = error
-

debian/changelog

@@ -0,0 +1,7 @@
+kazoo-configs (3-0) UNRELEASED; urgency=low
+
+  * Kazoo Configs.
+
+ -- Travis Cross <tc@traviscross.com>  Mon, 26 May 2014 08:59:35 +0100
+ 
+ 

debian/compat

@@ -0,0 +1 @@
+8

debian/control

@@ -0,0 +1,23 @@
+#### Do not edit!  This file is auto-generated from debian/bootstrap.sh.
+
+Source: kazoo-configs
+Section: comm
+Priority: optional
+Maintainer: Travis Cross <tc@traviscross.com>
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.3
+Homepage: http://www.2600hz.com/
+
+Package: kazoo-configs
+Architecture: all
+Provides: kazoo-configs-freeswitch
+Depends: ${misc:Depends}
+Description: Kazoo Configurations
+ This package contains the Kazoo Configuration Files.
+
+Package: kazoo-configs-freeswitch
+Architecture: all
+Depends: ${misc:Depends}
+Description: Kazoo Configurations for FreeSWITCH
+ This package contains the Kazoo Configuration Files fo FreeSWITCH.
+

debian/kazoo-configs-freeswitch.install

@@ -0,0 +1,3 @@
+#### Do not edit!  This file is auto-generated from debian/bootstrap.sh.
+freeswitch /etc/kazoo
+

debian/kazoo-configs-freeswitch.postinst

@@ -0,0 +1,41 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+  configure)
+    if ! getent group freeswitch >/dev/null; then
+      groupadd --system freeswitch
+    fi
+    if ! getent passwd freeswitch >/dev/null; then
+      useradd --system -g freeswitch -Gaudio \
+        -d /var/lib/freeswitch \
+        -s /bin/false \
+        -e '' \
+        -c 'FreeSWITCH' \
+        freeswitch
+    fi
+    for x in \
+        /etc/kazoo/freeswitch \
+        /etc/kazoo/freeswitch/autoload_configs \
+        /etc/kazoo/freeswitch/certs \
+        /etc/kazoo/freeswitch/chatplan \
+        /etc/kazoo/freeswitch/dialplan \
+        /etc/kazoo/freeswitch/directory \
+        /etc/kazoo/freeswitch/scripts \
+        /etc/kazoo/freeswitch/sip_profiles;
+    do
+      mkdir -p $x
+      chown -R freeswitch:freeswitch $x
+      chmod -R o-wx,g+u $x
+    done
+    ;;
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#
+exit 0

debian/kazoo-configs-freeswitch.postrm

@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+  purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    if [ "$1" = "purge" ]; then
+      if getent passwd freeswitch >/dev/null; then
+        userdel freeswitch
+      fi
+      if getent group freeswitch >/dev/null; then
+        groupdel freeswitch
+      fi
+      for x in \
+        /etc/kazoo/freeswitch;
+      do
+        rm -rf $x
+      done
+    fi
+    ;;
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#
+exit 0

debian/kazoo-configs.install

@@ -0,0 +1,12 @@
+#### Do not edit!  This file is auto-generated from debian/bootstrap.sh.
+app.config /etc/kazoo
+config.ini /etc/kazoo
+vm.args /etc/kazoo
+freeswitch /etc/kazoo
+kamailio /etc/kazoo
+haproxy /etc/kazoo
+bigcouch /etc/kazoo
+rabbitmq /etc/kazoo
+
+
+

debian/rules

@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+
+%:
+	dh $@
+
+override_dh_auto_build:
+
+override_dh_auto_install:
+

freeswitch/chatplan/.placeholder

@@ -0,0 +1 @@
+just a placeholder

freeswitch/dialplan/.placeholder

@@ -0,0 +1 @@
+just a placeholder

freeswitch/directory/.placeholder

@@ -0,0 +1 @@
+just a placeholder

freeswitch/freeswitch.xml

@@ -36,16 +36,22 @@
 
     <X-PRE-PROCESS cmd="set" data="send_silence_when_idle=400"/>
 
-    <X-PRE-PROCESS cmd="set" data="codecs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,G729,GSM,OPUS,Speex"/>
+    <X-PRE-PROCESS cmd="set" data="codecs=H263,OPUS,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,G729,GSM,Speex"/>
 
     <section name="configuration" description="Various Configuration">
         <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>
     </section>
 
     <section name="dialplan" description="Regex/XML Dialplan">
+        <X-PRE-PROCESS cmd="include" data="dialplan/*.xml"/>
+    </section>
+
+    <section name="chatplan" description="Regex/XML Chatplan">
+        <X-PRE-PROCESS cmd="include" data="chatplan/*.xml"/>
     </section>
 
     <section name="directory" description="User Directory">
+        <X-PRE-PROCESS cmd="include" data="directory/*.xml"/>
     </section>
 
     <section name="phrases" description="Speech Phrase Management">

freeswitch/scripts/kazoo-sync.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+#### KAZOO - FREESWITCH OFFLINE
+##
+##  run this command in a whapps server on a kazoo cluster to obtain the synchronization key
+##
+##  sup whapps_config get crossbar.freeswitch offline_configuration_key `sup wh_util rand_hex_binary 32 | sed  s/[\<\"\>]*//g`  | sed  s/[\<\"\>]*//g
+##
+##  to change the key use the following command
+##
+##  sup whapps_config set crossbar.freeswitch offline_configuration_key `sup wh_util rand_hex_binary 32 | sed  s/[\<\"\>]*//g`  
+##
+##  
+##
+####
+
+KEY=86d4f72ba888dba211fa2d17dcb558f0c8483e1ca5a048757b7d0e9204a3c24e
+
+curl --insecure https://your-kazoo-api-fqdn:8443/v2/freeswitch?key=${KEY} -o update.zip
+sudo unzip -o -d /etc/kazoo/freeswitch update.zip
+fs_cli --execute reloadxml

freeswitch/sip_profiles/sipinterface_1.xml

@@ -90,7 +90,7 @@
 
 
             <!-- TLS -->
-            <param name="tls" value="true"/>
+            <param name="tls" value="false"/>
             <param name="tls-sip-port" value="11001"/>
             <param name="tls-cert-dir" value="/etc/kazoo/freeswitch/certs"/>
             <!--<param name="tls-only" value="false"/>
@@ -141,7 +141,7 @@
             <param name="enable-timer" value="false"/>
             <param name="rtp-timeout-sec" value="3600"/>
             <param name="rtp-hold-timeout-sec" value="3600"/>
-            <param name="minimum-session-expires" value="120"/>
+            <param name="minimum-session-expires" value="60"/>
             <!--<param name="sip-force-expires" value="600"/>-->
             <!--<param name="sip-expires-max-deviation" value="120"/>-->
             <!--<param name="session-timeout" value="120"/>-->

haproxy/haproxy.cfg

@@ -1,40 +1,39 @@
 global
-    log 127.0.0.1   local0
-    log 127.0.0.1   local1 notice
-    maxconn 4096
-    user haproxy
-    group haproxy
-    stats socket    /tmp/haproxy.sock mode 777
+        log 127.0.0.1   local0
+        log 127.0.0.1   local1 notice
+        maxconn 4096
+        user haproxy
+        group haproxy
+        stats socket    /tmp/haproxy.sock mode 777
 
 defaults
-    log global
-    mode http
-    option httplog
-    option dontlognull
-    option redispatch
-    option httpchk GET /
-    option allbackups
-    option http-server-close
-    maxconn 2000
-    retries 3
-    timeout connect 6000ms
-    timeout client 120000ms
-    timeout server 120000ms
-
+        log global
+        mode http
+        option httplog
+        option dontlognull
+        option redispatch
+        option httpchk GET /
+        option allbackups
+        maxconn 2000
+        retries 3
+        timeout connect 6000ms
+        timeout client 12000ms
+        timeout server 12000ms
+        
 listen bigcouch-data 127.0.0.1:15984
-    balance roundrobin
+  balance roundrobin
     server db1.zone1.mydomain.com 127.0.0.1:5984 check
     server db2.zone1.mydomain.com 127.0.0.2:5984 check
     server db3.zone2.mydomain.com 127.0.0.3:5984 check backup
     server db4.zone2.mydomain.com 127.0.0.4:5984 check backup
 
 listen bigcouch-mgr 127.0.0.1:15986
-    balance roundrobin
+  balance roundrobin
     server db1.zone1.mydomain.com 127.0.0.1:5986 check
     server db2.zone1.mydomain.com 127.0.0.2:5986 check
     server db3.zone2.mydomain.com 127.0.0.3:5986 check backup
     server db4.zone2.mydomain.com 127.0.0.4:5986 check backup
 
 listen haproxy-stats 127.0.0.1:22002
-    mode http
-    stats uri /
+  mode http
+  stats uri /

kamailio/accounting-role.cfg

@@ -0,0 +1,22 @@
+####### Flags #######
+flags
+    FLAG_ACC:		      7,
+    FLAG_ACCMISSED:	      8,
+    FLAG_ACCFAILED:	      9;
+
+######## Accounting module ########
+loadmodule "acc.so"
+
+######## Accounting params ########
+modparam("acc", "early_media", 0)
+modparam("acc", "report_ack", 0)
+modparam("acc", "report_cancels", 1)
+modparam("acc", "detect_direction", 0)
+modparam("acc", "log_flag", 7)
+modparam("acc", "log_level", 2)
+modparam("acc", "log_missed_flag", 8)
+modparam("acc", "failed_transaction_flag", 9)
+modparam("acc", "log_extra",
+        "src_user=$fU;src_domain=$fd;src_ip=$si;"
+        "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
+modparam("acc", "log_facility", "LOG_LOCAL6")

kamailio/dbtext/dispatcher

@@ -6,5 +6,4 @@
 ### 20 - Registrar servers (if not locally handled)
 
 # setid(integer) destination(sip uri) flags (integer, optional)
-1 sip:10.26.0.83:11000 0
-2 sip:10.26.0.84:11000 0
+1 sip:127.0.0.1:11000 0

kamailio/default.cfg

@@ -52,7 +52,7 @@ tcp_keepcnt = 3
 tcp_keepidle = 30
 tcp_keepintvl = 10
 tcp_linger2 = 30
-tcp_rd_buf_size = 4096
+tcp_rd_buf_size = 80000
 tcp_send_timeout = 10
 tcp_wq_blk_size = 2100
 tcp_wq_max = 10485760
@@ -170,6 +170,9 @@ include_file "websockets-role.cfg"
 #!ifdef TLS-ROLE
 include_file "tls-role.cfg"
 #!endif
+#!ifdef ACCOUNTING-ROLE
+include_file "accounting-role.cfg"
+#!endif
 
 ####### Permissions module ##########
 loadmodule "permissions.so"
@@ -323,11 +326,28 @@ route[HANDLE_IN_DIALOG_REQUESTS]
             record_route();
         }
         if (loose_route()) {
+	    #!ifdef ACCOUNTING-ROLE
+	        if (is_method("BYE")) {
+                    setflag(FLAG_ACC);
+                    setflag(FLAG_ACCFAILED);
+                }
+            #!endif
+
             #!ifdef WEBSOCKETS-ROLE
-            if (isdsturiset() && !handle_ruri_alias()) {
-                xlog("L_INFO", "$ci|stop|bad alias <$ru>\n");
-                sl_send_reply("400", "Bad Request");
-                exit;
+            if ($du == $null) {
+                handle_ruri_alias();
+                switch ($rc) {
+                case -1:
+                    xlog("L_ERR", "$ci|stop|failed to handle alias of R-URI $ru\n");
+                    send_reply("400", "Bad request");
+                    exit;
+                case 1:
+                    xlog("L_INFO", "$ci|log|loose_route in-dialog message with alias $du");
+                    break;
+                case 2:
+                    xlog("L_INFO", "$ci|log|loose_route in-dialog message with alias $du");
+                    break;
+                }
             }
             #!endif
 
@@ -396,6 +416,13 @@ route[RELAY]
 
 route[INTERNAL_TO_EXTERNAL_RELAY]
 {
+    #!ifdef ACCOUNTING-ROLE
+        if (is_method("INVITE")) {
+            setflag(FLAG_ACC);
+            setflag(FLAG_ACCFAILED);
+        }
+    #!endif
+
     remove_hf_re("X-.*");
 
     t_on_reply("EXTERNAL_REPLY");
@@ -407,6 +434,13 @@ route[INTERNAL_TO_EXTERNAL_RELAY]
 
 route[EXTERNAL_TO_INTERNAL_RELAY]
 {
+    #!ifdef ACCOUNTING-ROLE
+        if (is_method("INVITE") && is_present_hf("Proxy-Authorization")) {
+            setflag(FLAG_ACC);
+            setflag(FLAG_ACCFAILED);
+        }
+    #!endif
+
     #!ifdef NAT-TRAVERSAL-ROLE
     if (!isflagset(FLAG_INTERNALLY_SOURCED)) {
         route(NAT_TEST_AND_CORRECT);

kamailio/local.cfg

@@ -73,11 +73,13 @@ mhomed=0
 #!substdef "!UDP_SIP!udp:MY_IP_ADDRESS:5060!g"
 #!substdef "!TCP_SIP!tcp:MY_IP_ADDRESS:5060!g"
 #!substdef "!TLS_SIP!tls:MY_IP_ADDRESS:5061!g"
-#!substdef "!UDP_AGL_SIP!udp:MY_IP_ADDRESS:7000!g"
-#!substdef "!TCP_AGL_SIP!tcp:MY_IP_ADDRESS:7000!g"
-#!substdef "!TLS_AGL_SIP!tls:MY_IP_ADDRESS:7001!g"
+#!substdef "!UDP_ALG_SIP!udp:MY_IP_ADDRESS:7000!g"
+#!substdef "!TCP_ALG_SIP!tcp:MY_IP_ADDRESS:7000!g"
+#!substdef "!TLS_ALG_SIP!tls:MY_IP_ADDRESS:7001!g"
 #!substdef "!TCP_WS!tcp:MY_IP_ADDRESS:8080!g"
+#!substdef "!UDP_WS_SIP!udp:MY_IP_ADDRESS:8080!g"
 #!substdef "!TLS_WSS!tls:MY_IP_ADDRESS:8443!g"
+#!substdef "!UDP_WSS_SIP!udp:MY_IP_ADDRESS:8443!g"
 
 ## YOU SHOULD NOT HAVE TO CHANGE THESE!
 ##     This will bind the default SIP listeners
@@ -88,5 +90,5 @@ mhomed=0
 ##     what they are doing :)
 listen=UDP_SIP
 listen=TCP_SIP
-listen=UDP_AGL_SIP
-listen=TCP_AGL_SIP
+listen=UDP_ALG_SIP
+listen=TCP_ALG_SIP

kamailio/nat-traversal-role.cfg

@@ -11,7 +11,11 @@ route[NAT_TEST_AND_CORRECT]
 {
     if (is_present_hf("Record-Route")) {
         $var(i) = $rr_count;
-        while($var(i) > 0) {
+        ## We witnessed this loop execute more than
+        ##   500 times, probably do to inability to
+        ##   allocate rr_count or the parser.  Either
+        ##   way ensure the while loop is not unbound'd
+        while($var(i) > 0 && $var(i) < 30) {
             $var(i) = $var(i) - 1;
             $var(rr) = $(hdr(Record-Route)[$var(i)]);
             if (!is_myself("$(var(rr){nameaddr.uri})")) {

kamailio/presence-role.cfg

@@ -5,22 +5,31 @@ modparam("htable", "htable", "dbkp=>size=16;autoexpire=7200")
 loadmodule "presence.so"
 loadmodule "presence_dialoginfo.so"
 loadmodule "presence_mwi.so"
+loadmodule "presence_xml.so"
+
 modparam("presence", "subs_db_mode", 1)
 modparam("presence", "expires_offset", 60)
 modparam("presence", "publ_cache", 0)
-#modparam("presence", "min_expires", 300)
+modparam("presence", "min_expires", 0)
 modparam("presence", "max_expires", 3600)
 modparam("presence", "db_url", "MY_AMQP_URL/dialoginfo")
+modparam("presence", "send_fast_notify", 0)
+modparam("presence", "clean_period", 10)
+
+modparam("presence_xml", "integrated_xcap_server", 1)
+modparam("presence_xml", "db_url", "MY_AMQP_URL/dialoginfo")
+modparam("presence_xml", "force_active", 1)
 
 ######## Presence User Agent module ########
 loadmodule "pua.so"
-loadmodule "pua_dialoginfo.so"
-modparam("pua_dialoginfo", "library_mode", 1)
-modparam("pua", "db_url", "text:///etc/kazoo/kamailio/dbtext")
 modparam("pua", "db_mode", 0)
+modparam("pua", "db_url", "MY_AMQP_URL/dialoginfo")
 modparam("pua", "min_expires", 300)
 modparam("pua", "outbound_proxy", "sip:MY_IP_ADDRESS")
 
+loadmodule "pua_dialoginfo.so"
+modparam("pua_dialoginfo", "library_mode", 1)
+
 ####### Presence Logic ########
 route[HANDLE_SUBSCRIBE]
 {

kamailio/tls.cfg

@@ -20,7 +20,7 @@ require_certificate = no
 #crl = /etc/kazoo/kamailio/certs/crl.pem
 certificate = /etc/kazoo/kamailio/certs/cert.pem
 private_key = /etc/kazoo/kamailio/certs/key.pem
-ca_list = /etc/kazoo/kamailio/certs/ca.pem
+#ca_list = /etc/kazoo/kamailio/certs/ca.pem
 
 # This is the default client domain, settings
 # in this domain will be used for all outgoing

kamailio/websockets-role.cfg

@@ -1,8 +1,10 @@
 tcp_accept_no_cl=yes
 
 listen=TCP_WS
+listen=UDP_WS_SIP
 #!ifdef TLS-ROLE
 listen=TLS_WSS
+listen=UDP_WSS_SIP
 #!endif
 
 ######## NAT Traversal module - signaling functions ########

rabbitmq/rabbitmq.config

@@ -1,5 +1,5 @@
-[{rabbit, [{disk_free_limit, 5242880}
+[
+{rabbit, [{disk_free_limit, 5242880}
           ,{vm_memory_high_watermark, 0.8}
-          ,{hipe_compile, true}
          ]}
 ].