Merge branch 'martinl-#7318' into devel

voice-client/files/etc/asterisk_templates/cdr_syslog.conf.TEMPLATE

@@ -0,0 +1,5 @@
+[syslog]
+
+facility = local0
+priority = cdr
+template = "callId:${CDR(clid)}, src:${CDR(src)}, dst:${CDR(dst)}, dstContext:${CDR(dcontext)}, chan:${CDR(channel)}, dstChan:${CDR(dstchannel)},$ app:${CDR(lastapp)}, arg:${CDR(lastdata)}, start:${CDR(start)}, answ:${CDR(answer)}, end:${CDR(end)}, duration:${CDR(duration)}, billsec:${CDR(billsec)}, dispos:${CDR(disposition)}, amaflag:${CDR(amaflags)}, accCode:${CDR(accountcode)}, uniqId:${CDR(uniqueid)}, userfield:${CDR(userfield)}"

voice-client/files/etc/config/voice_client

@@ -167,3 +167,6 @@ config 'sip_service_provider' 'sip0'
 	option 'is_fax' '0'
 	option 'transport' 'udp'
 
+config cdr_log 'CDR_LOG'
+        option cdr_syslog '0'
+

voice-client/files/etc/init.d/voice_client

@@ -66,6 +66,7 @@ TMPL_QUEUE=$TEMPLATEDIR/queue.TEMPLATE
 
 TMPL_ASTERISK=$TEMPLATEDIR/asterisk.conf.TEMPLATE
 TMPL_CDR=$TEMPLATEDIR/cdr.conf.TEMPLATE
+TMPL_CDR_SYSLOG=$TEMPLATEDIR/cdr_syslog.conf.TEMPLATE
 TMPL_INDICATIONS=$TEMPLATEDIR/indications.conf.TEMPLATE
 TMPL_LOGGER=$TEMPLATEDIR/logger.conf.TEMPLATE
 TMPL_MANAGER=$TEMPLATEDIR/manager.conf.TEMPLATE
@@ -142,6 +143,7 @@ assemble_and_copy_config()
 	# Copy the template files which we don't edit.
 	cp $TMPL_ASTERISK		$WORKDIR/asterisk.conf
 	cp $TMPL_CDR			$WORKDIR/cdr.conf
+	cp $TMPL_CEL			$WORKDIR/cel.conf
 	cp $TMPL_INDICATIONS		$WORKDIR/indications.conf
 	cp $TMPL_MANAGER		$WORKDIR/manager.conf
 	cp $TMPL_MODULES		$WORKDIR/modules.conf
@@ -1116,6 +1118,21 @@ configure_cdr()
 {
 	mkdir -p /var/log/asterisk/cdr-csv
 	touch /var/log/asterisk/cdr-csv/Master.csv
+
+
+	local cdr_syslog
+	config_get cdr_syslog CDR_LOG cdr_syslog
+
+	echo "cdr_syslog: $cdr_syslog"
+
+        if [ -z "$cdr_syslog" ] ; then
+	    cdr_syslog='0'
+	fi
+
+	# Enable/disable CDR logging in syslog
+	if [ "$cdr_syslog" == "1" ] ; then
+            cp $TMPL_CDR_SYSLOG		        $WORKDIR/cdr_syslog.conf
+	fi
 }
 
 #