Blob Blame History Raw
From 99931f9e126bf7e53cae571cfd60df1ee47daf71 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Wed, 28 Jul 2010 07:27:48 -0500
Subject: [PATCH 2/6] Fix up some paths

---
 UPGRADE-1.4.txt                             |    2 +-
 configs/festival.conf.sample                |    2 +-
 configs/http.conf.sample                    |    6 ++--
 configs/iax.conf.sample                     |    4 +-
 configs/musiconhold.conf.sample             |    8 +++---
 configs/osp.conf.sample                     |    4 +-
 configs/phoneprov.conf.sample               |    2 +-
 contrib/scripts/astgenkey                   |    2 +-
 contrib/scripts/astgenkey.8                 |    6 ++--
 pbx/ael/ael-test/ael-test3/extensions.ael   |   28 +++++++++++++-------------
 pbx/ael/ael-test/ael-vtest13/extensions.ael |   28 +++++++++++++-------------
 pbx/ael/ael-test/ref.ael-vtest13            |   26 ++++++++++++------------
 12 files changed, 59 insertions(+), 59 deletions(-)

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