diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/extensions.ael.sample | 16 | ||||
| -rw-r--r-- | configs/extensions.conf.sample | 16 | ||||
| -rw-r--r-- | configs/extensions.lua.sample | 10 | ||||
| -rw-r--r-- | configs/meetme.conf.sample | 2 | ||||
| -rw-r--r-- | configs/muted.conf.sample | 4 | ||||
| -rw-r--r-- | configs/queues.conf.sample | 6 | ||||
| -rw-r--r-- | configs/rpt.conf.sample | 12 | ||||
| -rw-r--r-- | configs/sla.conf.sample | 10 | ||||
| -rw-r--r-- | configs/smdi.conf.sample | 2 | ||||
| -rw-r--r-- | configs/users.conf.sample | 2 | ||||
| -rw-r--r-- | configs/vpb.conf.sample | 2 | ||||
| -rw-r--r-- | configs/zapata.conf.sample | 68 |
12 files changed, 75 insertions, 75 deletions
diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample index 3bc16a315..21680a4db 100644 --- a/configs/extensions.ael.sample +++ b/configs/extensions.ael.sample @@ -20,19 +20,19 @@ globals { CONSOLE="Console/dsp"; // Console interface for demo - //CONSOLE=Zap/1 + //CONSOLE=DAHDI/1 //CONSOLE=Phone/phone0 IAXINFO=guest; // IAXtel username/password //IAXINFO="myuser:mypass"; - TRUNK="Zap/G2"; // Trunk interface + TRUNK="DAHDI/G2"; // Trunk interface // // Note the 'G2' in the TRUNK variable above. It specifies which group (defined - // in zapata.conf) to dial, i.e. group 2, and how to choose a channel to use in + // in dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in // the specified group. The four possible options are: // - // g: select the lowest-numbered non-busy Zap channel + // g: select the lowest-numbered non-busy DAHDI channel // (aka. ascending sequential hunt group). - // G: select the highest-numbered non-busy Zap channel + // G: select the highest-numbered non-busy DAHDI channel // (aka. descending sequential hunt group). // r: use a round-robin search, starting at the next highest channel than last // time (aka. ascending rotary hunt group). @@ -129,8 +129,8 @@ context ael-dundi-e164-via-pstn { // // If you are freely delivering calls to the PSTN, list them here // - //_1256428XXXX => Dial(Zap/G2/${EXTEN:7}); // Expose all of 256-428 - //_1256325XXXX => Dial(Zap/G2/${EXTEN:7}); // Ditto for 256-325 + //_1256428XXXX => Dial(DAHDI/G2/${EXTEN:7}); // Expose all of 256-428 + //_1256325XXXX => Dial(DAHDI/G2/${EXTEN:7}); // Ditto for 256-325 }; context ael-dundi-e164-local { @@ -418,7 +418,7 @@ context ael-default { // 6389 => Dial(MGCP/aaln/1@192.168.0.14); // 6394 => Dial(Local/6275/n); // this will dial ${MARK} -// 6275 => &ael-stdexten(6275,${MARK}); // assuming ${MARK} is something like Zap/2 +// 6275 => &ael-stdexten(6275,${MARK}); // assuming ${MARK} is something like DAHDI/2 // mark => goto 6275|1; // alias mark to 6275 // 6536 => &ael-stdexten(6236,${WIL}); // Ditto for wil // wil => goto 6236|1; diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index 6241cddf0..71a4b204f 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -116,19 +116,19 @@ clearglobalvars=no ; [globals] CONSOLE=Console/dsp ; Console interface for demo -;CONSOLE=Zap/1 +;CONSOLE=DAHDI/1 ;CONSOLE=Phone/phone0 IAXINFO=guest ; IAXtel username/password ;IAXINFO=myuser:mypass -TRUNK=Zap/G2 ; Trunk interface +TRUNK=DAHDI/G2 ; Trunk interface ; ; Note the 'G2' in the TRUNK variable above. It specifies which group (defined -; in zapata.conf) to dial, i.e. group 2, and how to choose a channel to use in +; in dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in ; the specified group. The four possible options are: ; -; g: select the lowest-numbered non-busy Zap channel +; g: select the lowest-numbered non-busy DAHDI channel ; (aka. ascending sequential hunt group). -; G: select the highest-numbered non-busy Zap channel +; G: select the highest-numbered non-busy DAHDI channel ; (aka. descending sequential hunt group). ; r: use a round-robin search, starting at the next highest channel than last ; time (aka. ascending rotary hunt group). @@ -225,8 +225,8 @@ TRUNKMSD=1 ; MSD digits to strip (usually 1 or 0) ; ; If you are freely delivering calls to the PSTN, list them here ; -;exten => _1256428XXXX,1,Dial(Zap/G2/${EXTEN:7}) ; Expose all of 256-428 -;exten => _1256325XXXX,1,Dial(Zap/G2/${EXTEN:7}) ; Ditto for 256-325 +;exten => _1256428XXXX,1,Dial(DAHDI/G2/${EXTEN:7}) ; Expose all of 256-428 +;exten => _1256325XXXX,1,Dial(DAHDI/G2/${EXTEN:7}) ; Ditto for 256-325 [dundi-e164-local] ; @@ -618,7 +618,7 @@ include => demo ;exten => 6394,1,Dial(Local/6275/n) ; this will dial ${MARK} ;exten => 6275,1,Gosub(stdexten,s,1(6275,${MARK})) - ; assuming ${MARK} is something like Zap/2 + ; assuming ${MARK} is something like DAHDI/2 ;exten => 6275,n,Goto(default,s,1) ; exited Voicemail ;exten => mark,1,Goto(6275|1) ; alias mark to 6275 ;exten => 6536,1,Gosub(stdexten,s,1(6236,${WIL})) diff --git a/configs/extensions.lua.sample b/configs/extensions.lua.sample index a6ae60ca6..8aee734b4 100644 --- a/configs/extensions.lua.sample +++ b/configs/extensions.lua.sample @@ -1,13 +1,13 @@ CONSOLE = "Console/dsp" -- Console interface for demo ---CONSOLE = "Zap/1" +--CONSOLE = "DAHDI/1" --CONSOLE = "Phone/phone0" IAXINFO = "guest" -- IAXtel username/password --IAXINFO = "myuser:mypass" -TRUNK = "Zap/G2" +TRUNK = "DAHDI/G2" TRUNKMSD = 1 -- TRUNK = "IAX2/user:pass@provider" @@ -92,8 +92,8 @@ TRUNKMSD = 1 -- -- Dialplan applications can be accessed through the global 'app' table. -- --- app.Dial("Zap/1") --- app.dial("Zap/1") +-- app.Dial("DAHDI/1") +-- app.dial("DAHDI/1") -- -- More examples can be found below. -- @@ -106,7 +106,7 @@ TRUNKMSD = 1 -- function outgoing_local(c, e) - app.dial("zap/1/" .. e, "", "") + app.dial("DAHDI/1/" .. e, "", "") end function demo_instruct() diff --git a/configs/meetme.conf.sample b/configs/meetme.conf.sample index a28c5d3c9..3eb3a82a5 100644 --- a/configs/meetme.conf.sample +++ b/configs/meetme.conf.sample @@ -5,7 +5,7 @@ [general] ;audiobuffers=32 ; The number of 20ms audio buffers to be used - ; when feeding audio frames from non-Zap channels + ; when feeding audio frames from non-DAHDI channels ; into the conference; larger numbers will allow ; for the conference to 'de-jitter' audio that arrives ; at different timing than the conference's timing diff --git a/configs/muted.conf.sample b/configs/muted.conf.sample index a5e869b99..15c7409d9 100644 --- a/configs/muted.conf.sample +++ b/configs/muted.conf.sample @@ -25,8 +25,8 @@ pass pass # # List each channel we're supposed to watch # -channel Zap/1 -channel Zap/2 +channel DAHDI/1 +channel DAHDI/2 channel SIP/mark # # Mute level is the percentage of the current volume we should diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample index f20f48c23..643cbab8c 100644 --- a/configs/queues.conf.sample +++ b/configs/queues.conf.sample @@ -401,9 +401,9 @@ shared_lastcall=no ; must also preload pbx_config.so (or pbx_ael.so, pbx_lua.so, or ; pbx_realtime.so, depending on how your dialplan is configured). ; -;member => Zap/1 -;member => Zap/2,10 -;member => Zap/3,10,Bob Johnson +;member => DAHDI/1 +;member => DAHDI/2,10 +;member => DAHDI/3,10,Bob Johnson ;member => Agent/1001 ;member => Agent/1002 ;member => Local/1000@default,0,John Smith,SIP/1000 diff --git a/configs/rpt.conf.sample b/configs/rpt.conf.sample index 6aee784dc..823672438 100644 --- a/configs/rpt.conf.sample +++ b/configs/rpt.conf.sample @@ -4,10 +4,10 @@ ;[000] ; Node ID of first repeater -;rxchannel = Zap/1 ; Rx audio/signalling channel +;rxchannel = DAHDI/1 ; Rx audio/signalling channel ; Note: if you use a unified interface (tx/rx on one channel), only ; specify the rxchannel and the txchannel will be assumed from the rxchannel -;txchannel = Zap/2 ; Tx audio/signalling channel +;txchannel = DAHDI/2 ; Tx audio/signalling channel ;duplex = 2 ; (Optional) set duplex operating mode ;; 0 = half duplex (telemetry and courtesy tones do not transmit) ;; 1 = semi-half duplex (telemetry and courtesy tones transmit, but not @@ -51,10 +51,10 @@ ;[001] ; Node ID of first repeater -;rxchannel = Zap/3 ; Rx audio/signalling channel +;rxchannel = DAHDI/3 ; Rx audio/signalling channel ; Note: if you use a unified interface (tx/rx on one channel), only ; specify the rxchannel and the txchannel will be assumed from the rxchannel -;txchannel = Zap/4 ; Tx audio/signalling channel +;txchannel = DAHDI/4 ; Tx audio/signalling channel ;functions = functions-repeater ; DTMF function list ;; specify this for a different function list then local when on link ;;link_functions = functions-different ; DTMF function list for link @@ -81,10 +81,10 @@ ;[002] ; Node ID of remote base -;rxchannel = Zap/5 ; Rx audio/signalling channel +;rxchannel = DAHDI/5 ; Rx audio/signalling channel ; Note: if you use a unified interface (tx/rx on one channel), only ; specify the rxchannel and the txchannel will be assumed from the rxchannel -;txchannel = Zap/6 ; Tx audio/signalling channel +;txchannel = DAHDI/6 ; Tx audio/signalling channel ;functions = functions-remote ;remote = ft897 ; Set remote=y for dumb remote or ; remote=ft897 for Yaesu FT-897 or diff --git a/configs/sla.conf.sample b/configs/sla.conf.sample index 75acc2bc4..3ae9dffac 100644 --- a/configs/sla.conf.sample +++ b/configs/sla.conf.sample @@ -21,15 +21,15 @@ ;type=trunk ; This line is what marks this entry as a trunk. -;device=Zap/3 ; Map this trunk declaration to a specific device. +;device=DAHDI/3 ; Map this trunk declaration to a specific device. ; NOTE: You can not just put any type of channel here. - ; Zap channels can be directly used. IP trunks + ; DAHDI channels can be directly used. IP trunks ; require some indirect configuration which is ; described in doc/asterisk.pdf. ;autocontext=line1 ; This supports automatic generation of the dialplan entries ; if the autocontext option is used. Each trunk should have - ; a unique context name. Then, in zapata.conf, this device + ; a unique context name. Then, in dahdi.conf, this device ; should be configured to have incoming calls go to this context. ;ringtimeout=30 ; Set how long to allow this trunk to ring on an inbound call before hanging @@ -49,12 +49,12 @@ ;[line2] ;type=trunk -;device=Zap/4 +;device=DAHDI/4 ;autocontext=line2 ;[line3] ;type=trunk -;device=Zap/3 +;device=DAHDI/3 ;autocontext=line3 ;[line4] diff --git a/configs/smdi.conf.sample b/configs/smdi.conf.sample index 669530e81..464f92134 100644 --- a/configs/smdi.conf.sample +++ b/configs/smdi.conf.sample @@ -2,7 +2,7 @@ [interfaces] ; Specify serial ports to listen for SMDI messages on below. These will be -; referenced later in zapata.conf. If you do not specify any interfaces then +; referenced later in dahdi.conf. If you do not specify any interfaces then ; SMDI will be disabled. Interfaces can have several different attributes ; associated with them. diff --git a/configs/users.conf.sample b/configs/users.conf.sample index 2a816d7e4..11ec54a54 100644 --- a/configs/users.conf.sample +++ b/configs/users.conf.sample @@ -68,7 +68,7 @@ pickupgroup = 1 ;fullname = Joe User ;email = joe@foo.bar ;secret = 1234 -;zapchan = 1 +;dahdichan = 1 ;hasvoicemail = yes ;vmsecret = 1234 ;hassip = yes diff --git a/configs/vpb.conf.sample b/configs/vpb.conf.sample index bcda655de..d1c06e1be 100644 --- a/configs/vpb.conf.sample +++ b/configs/vpb.conf.sample @@ -97,7 +97,7 @@ echocancel=off ; ; NOTE that other caller ID standards are supported in Asterisk, but are ; not yet active in chan_vpb. It should be reasonably trivial to add -; support for the other standards (see the default zapata.conf for a list +; support for the other standards (see the default dahdi.conf for a list ; of them) that Asterisk already handles. ; callerid=bell diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample index 8ddb7a517..f08bca9ab 100644 --- a/configs/zapata.conf.sample +++ b/configs/zapata.conf.sample @@ -1,10 +1,10 @@ ; -; Zapata telephony interface +; DAHDI telephony ; ; Configuration file ; -; You need to restart Asterisk to re-configure the Zap channel -; CLI> reload chan_zap.so +; You need to restart Asterisk to re-configure the DAHDI channel +; CLI> reload chan_dahdi.so ; will reload the configuration file, ; but not all configuration options are ; re-configured during a reload (signalling, as well as @@ -30,7 +30,7 @@ ; trunkgroup => <trunkgroup>,<dchannel>[,<backup1>...] ; ; trunkgroup is the numerical trunk group to create -; dchannel is the zap channel which will have the +; dchannel is the DAHDI channel which will have the ; d-channel for the trunk. ; backup1 is an optional list of backup d-channels. ; @@ -38,9 +38,9 @@ ;trunkgroup => 1,24 ; ; Spanmap: Associates a span with a trunk group -; spanmap => <zapspan>,<trunkgroup>[,<logicalspan>] +; spanmap => <dahdispan>,<trunkgroup>[,<logicalspan>] ; -; zapspan is the zap span number to associate +; dahdispan is the DAHDI span number to associate ; trunkgroup is the trunkgroup (specified above) for the mapping ; logicalspan is the logical span number within the trunk group to use. ; if unspecified, no logical span number is used. @@ -208,7 +208,7 @@ ; pritimer cannot be changed on a reload. ; ; Signalling method. The default is "auto". Valid values: -; auto: Use the current value from Zaptel. +; auto: Use the current value from DAHDI. ; em: E & M ; em_e1: E & M E1 ; em_w: E & M Wink @@ -286,8 +286,8 @@ ; ; A variety of timing parameters can be specified as well ; The default values for those are "-1", which is to use the -; compile-time defaults of the Zaptel kernel modules. The timing -; parameters, (with the standard default from Zaptel): +; compile-time defaults of the DAHDI kernel modules. The timing +; parameters, (with the standard default from DAHDI): ; ; prewink: Pre-wink time (default 50ms) ; preflash: Pre-flash time (default 50ms) @@ -364,7 +364,7 @@ usecallerid=yes ; first is the corresponding mailbox, and the second is 1 or 0, indicating if ; there are messages waiting or not. ; -;mwimonitornotify=/usr/local/bin/zapnotify.sh +;mwimonitornotify=/usr/local/bin/dahdinotify.sh ; ; Whether or not to enable call waiting on internal extensions ; With this set to 'yes', busy extensions will hear the call-waiting @@ -450,23 +450,23 @@ callreturn=yes ; Note that when setting the number of taps, the number 256 does not translate ; to 256 ms of echo cancellation. echocancel=256 means 256 / 8 = 32 ms. ; -; Note that if any of your Zaptel cards have hardware echo cancellers, +; Note that if any of your DAHDI cards have hardware echo cancellers, ; then this setting only turns them on and off; numeric settings will ; be treated as "yes". There are no special settings required for ; hardware echo cancellers; when present and enabled in their kernel ; modules, they take precedence over the software echo canceller compiled -; into Zaptel automatically. +; into DAHDI automatically. ; ; echocancel=yes ; -; As of Zaptel 1.4.8, some Zaptel echo cancellers (software and hardware) +; As of Zaptel 1.4.8, some DAHDI echo cancellers (software and hardware) ; support adjustable parameters; these parameters can be supplied as ; additional options to the 'echocancel' setting. Note that Asterisk ; does not attempt to validate the parameters or their values, so if you ; supply an invalid parameter you will not know the specific reason it ; failed without checking the kernel message log for the error(s) -; put there by Zaptel. +; put there by DAHDI. ; ;echocancel=128,param1=32,param2=0,param3=14 ; @@ -478,7 +478,7 @@ echocancelwhenbridged=yes ; ; In some cases, the echo canceller doesn't train quickly enough and there ; is echo at the beginning of the call. Enabling echo training will cause -; Zaptel to briefly mute the channel, send an impulse, and use the impulse +; DAHDI to briefly mute the channel, send an impulse, and use the impulse ; response to pre-train the echo canceller so it can start out with a much ; closer idea of the actual echo. Value may be "yes", "no", or a number of ; milliseconds to delay before training (default = 400) @@ -566,9 +566,9 @@ pickupgroup=1 ; ;callerid = asreceived ; -; should we use the caller ID from incoming call on zap transfer? +; should we use the caller ID from incoming call on DAHDI transfer? ; -;useincomingcalleridonzaptransfer = yes +;useincomingcalleridondahditransfer = yes ; ; AMA flags affects the recording of Call Detail Records. If specified ; it may be 'default', 'omit', 'billing', or 'documentation'. @@ -665,14 +665,14 @@ pickupgroup=1 ;progzone=uk ; ; Set the tonezone. Equivalent of the defaultzone settings in -; /etc/zaptel.conf . This sets the tone zone by number. -; Note that you'd still need to load tonezones (loadzone in zaptel.conf). +; /etc/dahdi.conf . This sets the tone zone by number. +; Note that you'd still need to load tonezones (loadzone in dahdi.conf). ; The default is -1: not to set anything. ;tonezone = 0 ; 0 is US ; ; FXO (FXS signalled) devices must have a timeout to determine if there was a ; hangup before the line was answered. This value can be tweaked to shorten -; how long it takes before Zap considers a non-ringing line to have hungup. +; how long it takes before DAHDI considers a non-ringing line to have hungup. ; ; ringtimeout will not update on a reload. ; @@ -708,7 +708,7 @@ pickupgroup=1 ;mohsuggest=default ; ; PRI channels can have an idle extension and a minunused number. So long as -; at least "minunused" channels are idle, chan_zap will try to call "idledial" +; at least "minunused" channels are idle, chan_dahdi will try to call "idledial" ; on them, and then dump them into the PBX in the "idleext" extension (which ; is of the form exten@context). When channels are needed the "idle" calls ; are disconnected (so long as there are at least "minidle" calls still @@ -724,17 +724,17 @@ pickupgroup=1 ;minunused=2 ;minidle=1 ; -; Configure jitter buffers in Zapata (each one is 20ms, default is 4) +; Configure jitter buffers in DAHDI (each one is 20ms, default is 4) ; This is set globally, rather than per-channel. ; ;jitterbuffers=4 ; ;------------------------------ JITTER BUFFER CONFIGURATION -------------------------- ; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of a - ; ZAP channel. Defaults to "no". An enabled jitterbuffer will + ; DAHDI channel. Defaults to "no". An enabled jitterbuffer will ; be used only if the sending side can create and the receiving - ; side can not accept jitter. The ZAP channel can't accept jitter, - ; thus an enabled jitterbuffer on the receive ZAP side will always + ; side can not accept jitter. The DAHDI channel can't accept jitter, + ; thus an enabled jitterbuffer on the receive DAHDI side will always ; be used if the sending side can create jitter. ; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds. @@ -744,7 +744,7 @@ pickupgroup=1 ; big jumps in/broken timestamps, usually sent from exotic devices ; and programs. Defaults to 1000. -; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a ZAP +; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a DAHDI ; channel. Two implementations are currently available - "fixed" ; (with size always equals to jbmax-size) and "adaptive" (with ; variable size, actually the new jb of IAX2). Defaults to fixed. @@ -928,15 +928,15 @@ pickupgroup=1 ; Configuration Sections ; ~~~~~~~~~~~~~~~~~~~~~~ -; You can also configure channels in a separate zapata.conf section. In +; You can also configure channels in a separate dahdi.conf section. In ; this case the keyword 'channel' is not used. Instead the keyword -; 'zapchan' is used (as in users.conf) - configuration is only processed -; in a section where the keyword zapchan is used. It will only be +; 'dahdichan' is used (as in users.conf) - configuration is only processed +; in a section where the keyword dahdichan is used. It will only be ; processed in the end of the section. Thus the following section: ; ;[phones] ;echocancel = 64 -;zapchan = 1-8 +;dahdichan = 1-8 ;group = 1 ; ; Is somewhat equivalent to the following snippet in the section @@ -948,7 +948,7 @@ pickupgroup=1 ; ; When starting a new section almost all of the configuration values are ; copied from their values at the end of the section [channels] in -; zapata.conf and [general] in users.conf - one section's configuration +; dahdi.conf and [general] in users.conf - one section's configuration ; does not affect another one's. ; ; Instead of letting common configuration values "slide through" you can @@ -966,16 +966,16 @@ pickupgroup=1 ;faxdetect = incoming ; ;[phone-1](phones) -;zapchan = 1 +;dahdichan = 1 ;callerid = My Name <501> ;mailbox = 501@mailboxes ; ; ;[fax](phones) -;zapchan = 2 +;dahdichan = 2 ;faxdetect = no ;context = fax ; ;[phone-3](phones) -;zapchan = 3 +;dahdichan = 3 ;pickupgroup = 3,4 |