|
 |
b4f7035 |
From 99931f9e126bf7e53cae571cfd60df1ee47daf71 Mon Sep 17 00:00:00 2001
|
|
|
b039500 |
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
|
|
|
149b019 |
Date: Wed, 28 Jul 2010 07:27:48 -0500
|
|
|
b4f7035 |
Subject: [PATCH 2/6] Fix up some paths
|
|
|
149b019 |
|
|
|
149b019 |
---
|
|
|
149b019 |
UPGRADE-1.4.txt | 2 +-
|
|
|
149b019 |
configs/festival.conf.sample | 2 +-
|
|
|
149b019 |
configs/http.conf.sample | 6 ++--
|
|
|
149b019 |
configs/iax.conf.sample | 4 +-
|
|
|
1e1e0a5 |
configs/musiconhold.conf.sample | 8 +++---
|
|
|
149b019 |
configs/osp.conf.sample | 4 +-
|
|
|
149b019 |
configs/phoneprov.conf.sample | 2 +-
|
|
|
149b019 |
contrib/scripts/astgenkey | 2 +-
|
|
|
149b019 |
contrib/scripts/astgenkey.8 | 6 ++--
|
|
|
149b019 |
pbx/ael/ael-test/ael-test3/extensions.ael | 28 +++++++++++++-------------
|
|
|
149b019 |
pbx/ael/ael-test/ael-vtest13/extensions.ael | 28 +++++++++++++-------------
|
|
|
149b019 |
pbx/ael/ael-test/ref.ael-vtest13 | 26 ++++++++++++------------
|
|
|
29eb470 |
12 files changed, 59 insertions(+), 59 deletions(-)
|
|
|
149b019 |
|
|
|
149b019 |
diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
|
|
|
149b019 |
index f99f937..981bca7 100644
|
|
|
149b019 |
--- a/UPGRADE-1.4.txt
|
|
|
149b019 |
+++ b/UPGRADE-1.4.txt
|
|
|
149b019 |
@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
|
|
|
149b019 |
WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
|
|
|
149b019 |
instead of the alternate-language files being stored in subdirectories underneath
|
|
|
149b019 |
the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
|
|
|
149b019 |
-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
|
|
|
149b019 |
+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
|
|
|
149b019 |
language itself, then places all the sound files for that language under that
|
|
|
149b019 |
directory and its subdirectories. This is the layout that will be created if you
|
|
|
149b019 |
select non-English languages to be installed via menuselect, HOWEVER Asterisk does
|
|
|
149b019 |
diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
|
|
|
a4d5529 |
index e918217..31d5fc2 100644
|
|
|
149b019 |
--- a/configs/festival.conf.sample
|
|
|
149b019 |
+++ b/configs/festival.conf.sample
|
|
|
a50d05d |
@@ -21,7 +21,7 @@
|
|
|
a50d05d |
; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
|
|
|
a50d05d |
; Defaults to /tmp/
|
|
|
a50d05d |
;
|
|
|
a50d05d |
-;cachedir=/var/lib/asterisk/festivalcache/
|
|
|
a50d05d |
+;cachedir=/var/spool/asterisk/festival/
|
|
|
a50d05d |
;
|
|
|
a50d05d |
; Festival command to send to the server.
|
|
|
a50d05d |
; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
|
|
|
149b019 |
diff --git a/configs/http.conf.sample b/configs/http.conf.sample
|
|
|
f1fc2dd |
index 8a63148..f65107a 100644
|
|
|
149b019 |
--- a/configs/http.conf.sample
|
|
|
149b019 |
+++ b/configs/http.conf.sample
|
|
|
a50d05d |
@@ -5,7 +5,7 @@
|
|
|
a50d05d |
; Note about Asterisk documentation:
|
|
|
a50d05d |
; If Asterisk was installed from a tarball, then the HTML documentation should
|
|
|
a50d05d |
; be installed in the static-http/docs directory which is
|
|
|
a50d05d |
-; (/var/lib/asterisk/static-http/docs) on linux by default. If the Asterisk
|
|
|
a50d05d |
+; (/usr/share/asterisk/static-http/docs) on linux by default. If the Asterisk
|
|
|
a50d05d |
; HTTP server is enabled in this file by setting the "enabled", "bindaddr",
|
|
|
a50d05d |
; and "bindport" options, then you should be able to view the documentation
|
|
|
a50d05d |
; remotely by browsing to:
|
|
|
f1fc2dd |
@@ -76,6 +76,6 @@ bindaddr=127.0.0.1
|
|
|
a50d05d |
;[post_mappings]
|
|
|
a50d05d |
;
|
|
|
a50d05d |
; In this example, if the prefix option is set to "asterisk", then using the
|
|
|
a50d05d |
-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
|
|
|
a50d05d |
-;uploads = /var/lib/asterisk/uploads/
|
|
|
a50d05d |
+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
|
|
|
a50d05d |
+;uploads = /var/spool/asterisk/uploads/
|
|
|
a50d05d |
;
|
|
|
149b019 |
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
|
|
|
d521bc0 |
index 35b8d77..78e6f2b 100644
|
|
|
149b019 |
--- a/configs/iax.conf.sample
|
|
|
149b019 |
+++ b/configs/iax.conf.sample
|
|
|
1ba6fea |
@@ -456,8 +456,8 @@ inkeys=freeworlddialup
|
|
|
a4d5529 |
; authentication is used, "inkeys" is a list of acceptable public keys on the
|
|
|
149b019 |
; local system that can be used to authenticate the remote peer, separated by
|
|
|
149b019 |
; the ":" character. "outkey" is a single, private key to use to authenticate
|
|
|
149b019 |
-; to the other side. Public keys are named /var/lib/asterisk/keys/<name>.pub
|
|
|
149b019 |
-; while private keys are named /var/lib/asterisk/keys/<name>.key. Private
|
|
|
149b019 |
+; to the other side. Public keys are named /usr/share/asterisk/keys/<name>.pub
|
|
|
149b019 |
+; while private keys are named /usr/share/asterisk/keys/<name>.key. Private
|
|
|
149b019 |
; keys should always be 3DES encrypted.
|
|
|
149b019 |
;
|
|
|
149b019 |
;
|
|
|
149b019 |
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
|
|
|
1e1e0a5 |
index 9147588..8cd83e5 100644
|
|
|
149b019 |
--- a/configs/musiconhold.conf.sample
|
|
|
149b019 |
+++ b/configs/musiconhold.conf.sample
|
|
|
1e1e0a5 |
@@ -31,8 +31,8 @@
|
|
|
1e1e0a5 |
;
|
|
|
a50d05d |
; The path specified can be either an absolute path (starts with '/'),
|
|
|
a50d05d |
; or a relative path; relative paths are interpreted as being relative
|
|
|
1e1e0a5 |
-; to the 'astdatalibdir' in asterisk.conf, which defaults to
|
|
|
a50d05d |
-; /var/lib/asterisk.
|
|
|
1e1e0a5 |
+; to the 'astdatadir' in asterisk.conf, which defaults to
|
|
|
a50d05d |
+; /usr/share/asterisk.
|
|
|
a50d05d |
;
|
|
|
a50d05d |
; NOTE:
|
|
|
a50d05d |
; If you are not using "autoload" in modules.conf, then you
|
|
|
149b019 |
@@ -68,7 +68,7 @@ directory=moh
|
|
|
a50d05d |
;mode=custom
|
|
|
a50d05d |
; Note that with mode=custom, a directory is not required, such as when reading
|
|
|
a50d05d |
; from a stream.
|
|
|
a50d05d |
-;directory=/var/lib/asterisk/mohmp3
|
|
|
a50d05d |
+;directory=/usr/share/asterisk/mohmp3
|
|
|
a50d05d |
;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
|
|
|
a50d05d |
|
|
|
a50d05d |
;[ulawstream]
|
|
|
149b019 |
@@ -80,5 +80,5 @@ directory=moh
|
|
|
a50d05d |
; choice
|
|
|
a50d05d |
;[solaris]
|
|
|
a50d05d |
;mode=custom
|
|
|
a50d05d |
-;directory=/var/lib/asterisk/mohmp3
|
|
|
a50d05d |
+;directory=/usr/share/asterisk/mohmp3
|
|
|
a50d05d |
;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
|
|
|
149b019 |
diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
|
|
|
a4d5529 |
index e72aa32..f7ee625 100644
|
|
|
149b019 |
--- a/configs/osp.conf.sample
|
|
|
149b019 |
+++ b/configs/osp.conf.sample
|
|
|
a4d5529 |
@@ -45,8 +45,8 @@
|
|
|
a50d05d |
;source=domain name or [IP address in brackets]
|
|
|
a50d05d |
;
|
|
|
a50d05d |
; Define path and file name of crypto files.
|
|
|
a4d5529 |
-; The default path for crypto file is /var/lib/asterisk/keys. If no path is
|
|
|
a50d05d |
-; defined, crypto files will in /var/lib/asterisk/keys directory.
|
|
|
149b019 |
+; The default path for crypto file is /usr/share/asterisk/keys. If no path is
|
|
|
a50d05d |
+; defined, crypto files will in /usr/share/asterisk/keys directory.
|
|
|
a50d05d |
;
|
|
|
a4d5529 |
; Specify the private key file name.
|
|
|
a4d5529 |
; If this parameter is unspecified or not present, the default name will be the
|
|
|
149b019 |
diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
|
|
|
f1fc2dd |
index 17d8b1f..9f4e2ea 100644
|
|
|
149b019 |
--- a/configs/phoneprov.conf.sample
|
|
|
149b019 |
+++ b/configs/phoneprov.conf.sample
|
|
|
b039500 |
@@ -130,7 +130,7 @@ ${MAC}.cfg => 000000000000.cfg ; Dynamically generated files.
|
|
|
149b019 |
${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
|
|
|
a4d5529 |
config/${MAC} => polycom.xml ; Dynamic Filename => template file
|
|
|
149b019 |
${MAC}-directory.xml => 000000000000-directory.xml
|
|
|
149b019 |
-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable
|
|
|
149b019 |
+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable
|
|
|
b039500 |
|
|
|
b039500 |
;snom 300, 320, 360, 370, 820, 821, 870 support
|
|
|
b039500 |
snom-${MAC}.xml => snom-mac.xml
|
|
|
149b019 |
diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
|
|
|
149b019 |
index 6376048..e4a5a80 100644
|
|
|
149b019 |
--- a/contrib/scripts/astgenkey
|
|
|
149b019 |
+++ b/contrib/scripts/astgenkey
|
|
|
149b019 |
@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
|
|
|
149b019 |
echo "in PEM format for use by Asterisk. You will be asked to"
|
|
|
149b019 |
echo "enter a passcode for your key multiple times. Please"
|
|
|
149b019 |
echo "enter the same code each time. The resulting files will"
|
|
|
149b019 |
- echo "need to be moved to /var/lib/asterisk/keys if you want"
|
|
|
149b019 |
+ echo "need to be moved to /usr/share/asterisk/keys if you want"
|
|
|
149b019 |
echo "to use them, and any private keys (.key files) will"
|
|
|
149b019 |
echo "need to be initialized at runtime either by running"
|
|
|
149b019 |
echo "Asterisk with the '-i' option, or with the 'init keys'"
|
|
|
149b019 |
diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
|
|
|
a4d5529 |
index 063feca..9ace9f2 100644
|
|
|
149b019 |
--- a/contrib/scripts/astgenkey.8
|
|
|
149b019 |
+++ b/contrib/scripts/astgenkey.8
|
|
|
a4d5529 |
@@ -87,7 +87,7 @@ The private key: secret.
|
|
|
a50d05d |
.RE
|
|
|
a50d05d |
|
|
|
a50d05d |
Those files should be copied to
|
|
|
a50d05d |
-.I /var/lib/asterisk/keys
|
|
|
a50d05d |
+.I /usr/share/asterisk/keys
|
|
|
a50d05d |
|
|
|
a50d05d |
(The private key: on your system. The public key: on other systems)
|
|
|
a50d05d |
|
|
|
a4d5529 |
@@ -121,10 +121,10 @@ readable, such as with the following commands:
|
|
|
149b019 |
And then make the key accessible to Asterisk (assuming you run it as
|
|
|
149b019 |
user "asterisk").
|
|
|
149b019 |
|
|
|
149b019 |
- chown asterisk /var/lib/asterisk/keys/yourname.*
|
|
|
149b019 |
+ chown asterisk /usr/share/asterisk/keys/yourname.*
|
|
|
149b019 |
|
|
|
149b019 |
.SH FILES
|
|
|
149b019 |
-.I /var/lib/asterisk/keys
|
|
|
149b019 |
+.I /usr/share/asterisk/keys
|
|
|
149b019 |
.RS
|
|
|
149b019 |
.RE
|
|
|
149b019 |
|
|
|
149b019 |
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
|
|
|
149b019 |
index ff1f6ae..53fb918 100755
|
|
|
149b019 |
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
|
|
|
149b019 |
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
|
|
|
149b019 |
@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
|
|
|
149b019 |
|
|
|
149b019 |
macro callerid-liar()
|
|
|
149b019 |
{
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
|
|
|
149b019 |
Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
|
|
|
149b019 |
// faces to get in the front door, and unidentified callers won't fair
|
|
|
149b019 |
// any better. You entered *MY* phone number. That won't work.
|
|
|
149b019 |
@@ -2106,7 +2106,7 @@ context homeline {
|
|
|
149b019 |
PrivacyManager();
|
|
|
149b019 |
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
|
|
|
149b019 |
{
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
|
|
|
149b019 |
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
|
|
|
149b019 |
Hangup();
|
|
|
149b019 |
return;
|
|
|
149b019 |
@@ -2138,7 +2138,7 @@ context homeline {
|
|
|
149b019 |
verbose(direct is XXX#${direct}XXXX);
|
|
|
149b019 |
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
|
|
|
149b019 |
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
|
|
|
149b019 |
switch(${direct})
|
|
|
149b019 |
{
|
|
|
149b019 |
@@ -2223,7 +2223,7 @@ context homeline {
|
|
|
149b019 |
|
|
|
149b019 |
}
|
|
|
149b019 |
1 => { // Sonya
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto s|loopback;
|
|
|
149b019 |
@@ -2421,51 +2421,51 @@ context homeline-kids {
|
|
|
149b019 |
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
|
|
|
149b019 |
}
|
|
|
149b019 |
1 => { // SEAN
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
|
|
|
149b019 |
// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
2 => { // ERIC
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
|
|
|
149b019 |
Voicemail(u4);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
|
|
|
149b019 |
// SetMusicOnHold(erics);
|
|
|
149b019 |
- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
|
|
|
149b019 |
// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
// goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
3 => { // RYAN
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
4 => { // KYLE
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
5 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
|
|
|
149b019 |
}
|
|
|
149b019 |
6 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
7 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
@@ -2517,7 +2517,7 @@ context workline {
|
|
|
149b019 |
// Otherwise, dial 1, and hopefully, you will reach Steve.
|
|
|
149b019 |
}
|
|
|
149b019 |
1 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
|
|
|
149b019 |
|
|
|
149b019 |
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
|
|
|
149b019 |
@@ -2778,7 +2778,7 @@ context homeext {
|
|
|
149b019 |
}
|
|
|
149b019 |
761 => {
|
|
|
149b019 |
Record(announcement:gsm);
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
|
|
|
149b019 |
goto s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
762 => {
|
|
|
149b019 |
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
|
|
|
149b019 |
index b7e953e..48baaef 100755
|
|
|
149b019 |
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
|
|
|
149b019 |
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
|
|
|
149b019 |
@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
|
|
|
149b019 |
|
|
|
149b019 |
macro callerid-liar()
|
|
|
149b019 |
{
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
|
|
|
149b019 |
Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
|
|
|
149b019 |
// faces to get in the front door, and unidentified callers won't fair
|
|
|
149b019 |
// any better. You entered *MY* phone number. That won't work.
|
|
|
149b019 |
@@ -2105,7 +2105,7 @@ context homeline {
|
|
|
149b019 |
PrivacyManager();
|
|
|
149b019 |
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
|
|
|
149b019 |
{
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
|
|
|
149b019 |
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
|
|
|
149b019 |
Hangup();
|
|
|
149b019 |
return;
|
|
|
149b019 |
@@ -2137,7 +2137,7 @@ context homeline {
|
|
|
149b019 |
verbose(direct is XXX#${direct}XXXX);
|
|
|
149b019 |
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
|
|
|
149b019 |
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
|
|
|
149b019 |
switch(${direct})
|
|
|
149b019 |
{
|
|
|
149b019 |
@@ -2222,7 +2222,7 @@ context homeline {
|
|
|
149b019 |
|
|
|
149b019 |
}
|
|
|
149b019 |
1 => { // Sonya
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto s|loopback;
|
|
|
149b019 |
@@ -2420,51 +2420,51 @@ context homeline-kids {
|
|
|
149b019 |
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
|
|
|
149b019 |
}
|
|
|
149b019 |
1 => { // SEAN
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
|
|
|
149b019 |
// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
2 => { // ERIC
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
|
|
|
149b019 |
Voicemail(u4);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
|
|
|
149b019 |
// SetMusicOnHold(erics);
|
|
|
149b019 |
- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
|
|
|
149b019 |
// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
// goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
3 => { // RYAN
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
4 => { // KYLE
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
5 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
|
|
|
149b019 |
}
|
|
|
149b019 |
6 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
7 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
|
|
|
149b019 |
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
|
|
|
149b019 |
goto homeline|s|loopback;
|
|
|
149b019 |
@@ -2516,7 +2516,7 @@ context workline {
|
|
|
149b019 |
// Otherwise, dial 1, and hopefully, you will reach Steve.
|
|
|
149b019 |
}
|
|
|
149b019 |
1 => {
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
|
|
|
149b019 |
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
|
|
|
149b019 |
|
|
|
149b019 |
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
|
|
|
149b019 |
@@ -2777,7 +2777,7 @@ context homeext {
|
|
|
149b019 |
}
|
|
|
149b019 |
761 => {
|
|
|
149b019 |
Record(announcement:gsm);
|
|
|
149b019 |
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
|
|
|
149b019 |
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
|
|
|
149b019 |
goto s|loopback;
|
|
|
149b019 |
}
|
|
|
149b019 |
762 => {
|
|
|
149b019 |
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
|
|
|
29eb470 |
index 3c66be2..bedb8d8 100644
|
|
|
149b019 |
--- a/pbx/ael/ael-test/ref.ael-vtest13
|
|
|
149b019 |
+++ b/pbx/ael/ael-test/ref.ael-vtest13
|
|
|
29eb470 |
@@ -2182,7 +2182,7 @@ exten => ~~s~~,20,Return()
|
|
|
a50d05d |
|
|
|
a50d05d |
|
|
|
149b019 |
[callerid-liar]
|
|
|
29eb470 |
-exten => ~~s~~,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
|
|
|
29eb470 |
+exten => ~~s~~,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
|
|
|
29eb470 |
exten => ~~s~~,2,Background(priv-liar)
|
|
|
29eb470 |
exten => ~~s~~,3,Hangup()
|
|
|
29eb470 |
exten => ~~s~~,4,Return()
|
|
|
29eb470 |
@@ -2217,7 +2217,7 @@ exten => s,3,Set(repeatcount=0)
|
|
|
29eb470 |
exten => s,4,Zapateller(nocallerid)
|
|
|
29eb470 |
exten => s,5,PrivacyManager()
|
|
|
29eb470 |
exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
|
|
|
29eb470 |
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
|
|
|
29eb470 |
+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
|
|
|
29eb470 |
exten => s,8,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
|
|
|
29eb470 |
exten => s,9,Hangup()
|
|
|
29eb470 |
exten => s,10,Return()
|
|
|
29eb470 |
@@ -2243,7 +2243,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
|
|
|
29eb470 |
exten => s,30,verbose(direct is XXX#${direct}XXXX)
|
|
|
29eb470 |
exten => s,31,Playback(greetings/direct)
|
|
|
29eb470 |
exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
|
|
|
29eb470 |
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
29eb470 |
+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
29eb470 |
exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
|
|
|
29eb470 |
exten => s,35,Goto(sw_92_${direct},10)
|
|
|
29eb470 |
exten => s,36,NoOp(Finish switch_if_homeline_91_92)
|
|
|
29eb470 |
@@ -2322,7 +2322,7 @@ exten => sw_92_2,10,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telema
|
|
|
68101a3 |
exten => sw_92_2,11,Goto(s,loopback)
|
|
|
29eb470 |
exten => sw_92_1,10,Gosub(std-priv-exten,~~s~~,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
|
|
|
68101a3 |
exten => sw_92_1,11,Goto(s,loopback)
|
|
|
149b019 |
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
|
|
|
29eb470 |
exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 1,4,Goto(s,loopback)
|
|
|
29eb470 |
@@ -2399,31 +2399,31 @@ exten => o,1,Goto(s,begin)
|
|
|
a50d05d |
|
|
|
149b019 |
[homeline-kids]
|
|
|
149b019 |
exten => s,1(begin),Background(murphy-homeline-kids)
|
|
|
149b019 |
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
|
|
|
29eb470 |
exten => 1,3,Gosub(std-priv-exten,~~s~~,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 1,4,Goto(homeline,s,loopback)
|
|
|
149b019 |
-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
|
|
|
149b019 |
exten => 2,3,Voicemail(u4)
|
|
|
149b019 |
exten => 2,4,Goto(homeline,s,loopback)
|
|
|
149b019 |
-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
|
|
|
29eb470 |
exten => 3,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 3,4,Goto(homeline,s,loopback)
|
|
|
149b019 |
-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
|
|
|
29eb470 |
exten => 4,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 4,4,Goto(homeline,s,loopback)
|
|
|
149b019 |
-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
|
|
|
29eb470 |
exten => 5,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 5,4,Goto(homeline,s,loopback)
|
|
|
149b019 |
-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
|
|
|
29eb470 |
exten => 6,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 6,4,Goto(homeline,s,loopback)
|
|
|
149b019 |
-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
|
|
|
29eb470 |
exten => 7,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 7,4,Goto(homeline,s,loopback)
|
|
|
29eb470 |
@@ -2451,7 +2451,7 @@ exten => s,5,Gosub(fillcidname,~~s~~,1)
|
|
|
149b019 |
exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
|
|
|
149b019 |
exten => s,7(loopback),Background(greetings/greeting)
|
|
|
149b019 |
exten => s,8,Background(murphy-office-intro1)
|
|
|
149b019 |
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
|
|
|
149b019 |
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
|
|
|
29eb470 |
exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
|
|
|
149b019 |
exten => 1,4,Goto(s,loopback)
|
|
|
29eb470 |
@@ -2577,7 +2577,7 @@ exten => 6,1,Background(recording)
|
|
|
149b019 |
exten => 760,1,DateTime()
|
|
|
149b019 |
exten => 760,2,Goto(s,loopback)
|
|
|
149b019 |
exten => 761,1,Record(announcement:gsm)
|
|
|
149b019 |
-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
|
|
|
149b019 |
+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
|
|
|
149b019 |
exten => 761,3,Goto(s,loopback)
|
|
|
149b019 |
exten => 762,1,agi(tts-riddle.agi)
|
|
|
149b019 |
exten => 762,2,Background(gsm/what-time-it-is2)
|
|
|
149b019 |
--
|
|
|
d521bc0 |
1.7.6.4
|
|
|
149b019 |
|