FHS-paths.patch

diff -urN asterisk-16.15.0.org/agi/DialAnMp3.agi asterisk-16.15.0/agi/DialAnMp3.agi
--- asterisk-16.15.0.org/agi/DialAnMp3.agi	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/agi/DialAnMp3.agi	2020-11-27 12:44:43.374449817 +0100
@@ -17,7 +17,7 @@
 	print STDERR " -- $i = $AGI{$i}\n";
 }
 
-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
 
 sub checkresult {
 	my ($res) = @_;
diff -urN asterisk-16.15.0.org/agi/jukebox.agi asterisk-16.15.0/agi/jukebox.agi
--- asterisk-16.15.0.org/agi/jukebox.agi	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/agi/jukebox.agi	2020-11-27 12:44:43.374449817 +0100
@@ -17,7 +17,7 @@
 #
 # Uses festival to list off all your MP3 music files over a channel in
 # a hierarchical fashion.  Put this file in your agi-bin folder which
-# is located at: /var/lib/asterisk/agi-bin  Be sure to chmod +x it!
+# is located at: /usr/share/asterisk/agi-bin  Be sure to chmod +x it!
 #
 # Invocation Example:
 #   exten => 68742,1,Answer()
diff -urN asterisk-16.15.0.org/agi/numeralize asterisk-16.15.0/agi/numeralize
--- asterisk-16.15.0.org/agi/numeralize	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/agi/numeralize	2020-11-27 12:44:43.374449817 +0100
@@ -6,7 +6,7 @@
 
 $mp3dir="/usr/media/mpeg3";
 
-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
 sub process_dir {
 	my ($dir) = @_;
 	my $file;
diff -urN asterisk-16.15.0.org/configs/samples/festival.conf.sample asterisk-16.15.0/configs/samples/festival.conf.sample
--- asterisk-16.15.0.org/configs/samples/festival.conf.sample	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/configs/samples/festival.conf.sample	2020-11-27 12:44:43.374449817 +0100
@@ -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/festivalcache/
 ;
 ; Festival command to send to the server.
 ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
diff -urN asterisk-16.15.0.org/configs/samples/http.conf.sample asterisk-16.15.0/configs/samples/http.conf.sample
--- asterisk-16.15.0.org/configs/samples/http.conf.sample	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/configs/samples/http.conf.sample	2020-11-27 12:44:43.374449817 +0100
@@ -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:
@@ -127,8 +127,8 @@
 ; config permission to POST files.
 ;
 ; 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/
 ;
 
 ;[uripath]
diff -urN asterisk-16.15.0.org/configs/samples/iax.conf.sample asterisk-16.15.0/configs/samples/iax.conf.sample
--- asterisk-16.15.0.org/configs/samples/iax.conf.sample	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/configs/samples/iax.conf.sample	2020-11-27 12:44:43.374449817 +0100
@@ -541,8 +541,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. If encryption is used (applicable to
 ; md5 and rsa only), a secret must be provided.
 ;
diff -urN asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample asterisk-16.15.0/configs/samples/musiconhold.conf.sample
--- asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/configs/samples/musiconhold.conf.sample	2020-11-27 12:44:43.377783255 +0100
@@ -36,7 +36,7 @@
 ; 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.
+; /usr/share/asterisk.
 ;
 ; NOTE:
 ; If you are not using "autoload" in modules.conf, then you
@@ -102,7 +102,7 @@
 ;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]
@@ -118,7 +118,7 @@
 ; 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
 
 ; By default, when res_musiconhold reloads or unloads, it sends a HUP signal
diff -urN asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample asterisk-16.15.0/configs/samples/phoneprov.conf.sample
--- asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/configs/samples/phoneprov.conf.sample	2020-11-27 12:44:43.377783255 +0100
@@ -136,7 +136,7 @@
 ${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
--- a/configs/samples/res_config_sqlite3.conf.sample~	2022-10-19 16:31:39.000000000 +0200
+++ b/configs/samples/res_config_sqlite3.conf.sample	2022-11-30 07:44:04.009791957 +0100
@@ -1,7 +1,7 @@
 ; Define a realtime database name to use in extconfig.conf
 ;
 ;[asterisk]
-;dbfile => /var/lib/asterisk/realtime.sqlite3
+;dbfile => /var/spool/asterisk/realtime.sqlite3
 ;
 ; debug - Turn on debugging information
 ;debug=yes
@@ -32,4 +32,4 @@
 ; busy timeout - timeout in miliseconds to stop waiting for locked database.
 ;   More info at https://www.sqlite.org/c3ref/busy_timeout.html
 ;
-;busy_timeout=1000
\ No newline at end of file
+;busy_timeout=1000
diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey asterisk-16.15.0/contrib/scripts/astgenkey
--- asterisk-16.15.0.org/contrib/scripts/astgenkey	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/contrib/scripts/astgenkey	2020-11-27 12:44:43.377783255 +0100
@@ -29,7 +29,7 @@
 	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 'keys init'"
diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey.8 asterisk-16.15.0/contrib/scripts/astgenkey.8
--- asterisk-16.15.0.org/contrib/scripts/astgenkey.8	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/contrib/scripts/astgenkey.8	2020-11-27 12:44:43.377783255 +0100
@@ -87,7 +87,7 @@
 .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 @@
 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 -urN asterisk-16.15.0.org/contrib/utils/README.rawplayer asterisk-16.15.0/contrib/utils/README.rawplayer
--- asterisk-16.15.0.org/contrib/utils/README.rawplayer	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/contrib/utils/README.rawplayer	2020-11-27 12:44:43.377783255 +0100
@@ -16,7 +16,7 @@
 sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
 
 
-Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
+Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
 and set up a class in musiconhold.conf like so:
 
 [classes]
diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-16.15.0/pbx/ael/ael-test/ael-test3/extensions.ael
--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-test3/extensions.ael	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/pbx/ael/ael-test/ael-test3/extensions.ael	2020-11-27 12:44:43.377783255 +0100
@@ -2049,7 +2049,7 @@
 
 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 @@
 		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 @@
 			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 @@
 
 	}
 	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 @@
 		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 @@
                                               // 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 @@
 	}
 	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 -urN asterisk-16.15.0.org/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-16.15.0/pbx/ael/ael-test/ael-vtest13/extensions.ael
--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-vtest13/extensions.ael	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/pbx/ael/ael-test/ael-vtest13/extensions.ael	2020-11-27 12:44:43.377783255 +0100
@@ -2048,7 +2048,7 @@
 
 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 @@
 		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 @@
 			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 @@
 
 	}
 	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 @@
 		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 @@
                                               // 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 @@
 	}
 	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 -urN asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13 asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13
--- asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13	2020-11-27 12:44:43.381116692 +0100
@@ -2182,7 +2182,7 @@
 
 
 [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,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,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,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 @@
 
 [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,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 => 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)
diff -urN asterisk-16.15.0.org/utils/ael_main.c asterisk-16.15.0/utils/ael_main.c
--- asterisk-16.15.0.org/utils/ael_main.c	2020-11-19 13:34:40.000000000 +0100
+++ asterisk-16.15.0/utils/ael_main.c	2020-11-27 12:44:43.381116692 +0100
@@ -525,7 +525,7 @@
 		strcpy(config_dir, "/etc/asterisk");
 		localized_use_conf_dir();
 	}
-	strcpy(var_dir, "/var/lib/asterisk");
+	strcpy(var_dir, "/usr/share/asterisk");
 
 	if( dump_extensions ) {
 		dumpfile = fopen("extensions.conf.aeldump","w");