]> git.pld-linux.org Git - packages/asterisk.git/blame - FHS-paths.patch
projects / packages / asterisk.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Release 2 (by relup.sh)
[packages/asterisk.git] / FHS-paths.patch
CommitLineData
1f5d25f5
AM		 1diff -urN asterisk-16.15.0.org/agi/DialAnMp3.agi asterisk-16.15.0/agi/DialAnMp3.agi
2--- asterisk-16.15.0.org/agi/DialAnMp3.agi 2020-11-19 13:34:40.000000000 +0100
3+++ asterisk-16.15.0/agi/DialAnMp3.agi 2020-11-27 12:44:43.374449817 +0100
e3a22b69
JK		 4@@ -17,7 +17,7 @@
5 print STDERR " -- $i = $AGI{$i}\n";
6 }
6889aefb 7
e3a22b69
JK		 8-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
9+dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
6889aefb 10
e3a22b69
JK		 11 sub checkresult {
12 my ($res) = @_;
1f5d25f5
AM		 13diff -urN asterisk-16.15.0.org/agi/jukebox.agi asterisk-16.15.0/agi/jukebox.agi
14--- asterisk-16.15.0.org/agi/jukebox.agi 2020-11-19 13:34:40.000000000 +0100
15+++ asterisk-16.15.0/agi/jukebox.agi 2020-11-27 12:44:43.374449817 +0100
e3a22b69
JK		 16@@ -17,7 +17,7 @@
17 #
18 # Uses festival to list off all your MP3 music files over a channel in
19 # a hierarchical fashion. Put this file in your agi-bin folder which
20-# is located at: /var/lib/asterisk/agi-bin Be sure to chmod +x it!
21+# is located at: /usr/share/asterisk/agi-bin Be sure to chmod +x it!
22 #
23 # Invocation Example:
24 # exten => 68742,1,Answer()
1f5d25f5
AM		 25diff -urN asterisk-16.15.0.org/agi/numeralize asterisk-16.15.0/agi/numeralize
26--- asterisk-16.15.0.org/agi/numeralize 2020-11-19 13:34:40.000000000 +0100
27+++ asterisk-16.15.0/agi/numeralize 2020-11-27 12:44:43.374449817 +0100
e3a22b69 28@@ -6,7 +6,7 @@
6889aefb 29
e3a22b69
JK		 30 $mp3dir="/usr/media/mpeg3";
31
32-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
33+dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
34 sub process_dir {
35 my ($dir) = @_;
36 my $file;
1f5d25f5
AM		 37diff -urN asterisk-16.15.0.org/configs/samples/festival.conf.sample asterisk-16.15.0/configs/samples/festival.conf.sample
38--- asterisk-16.15.0.org/configs/samples/festival.conf.sample 2020-11-19 13:34:40.000000000 +0100
39+++ asterisk-16.15.0/configs/samples/festival.conf.sample 2020-11-27 12:44:43.374449817 +0100
e3a22b69
JK		 40@@ -21,7 +21,7 @@
41 ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
42 ; Defaults to /tmp/
43 ;
44-;cachedir=/var/lib/asterisk/festivalcache/
0f0650bc 45+;cachedir=/var/spool/asterisk/festivalcache/
e3a22b69
JK		 46 ;
47 ; Festival command to send to the server.
48 ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
1f5d25f5
AM		 49diff -urN asterisk-16.15.0.org/configs/samples/http.conf.sample asterisk-16.15.0/configs/samples/http.conf.sample
50--- asterisk-16.15.0.org/configs/samples/http.conf.sample 2020-11-19 13:34:40.000000000 +0100
51+++ asterisk-16.15.0/configs/samples/http.conf.sample 2020-11-27 12:44:43.374449817 +0100
e3a22b69
JK		 52@@ -5,7 +5,7 @@
53 ; Note about Asterisk documentation:
54 ; If Asterisk was installed from a tarball, then the HTML documentation should
55 ; be installed in the static-http/docs directory which is
56-; (/var/lib/asterisk/static-http/docs) on linux by default. If the Asterisk
57+; (/usr/share/asterisk/static-http/docs) on linux by default. If the Asterisk
58 ; HTTP server is enabled in this file by setting the "enabled", "bindaddr",
59 ; and "bindport" options, then you should be able to view the documentation
60 ; remotely by browsing to:
1f5d25f5 61@@ -127,6 +127,6 @@
00222a62 62 ; config permission to POST files.
e3a22b69
JK		 63 ;
64 ; In this example, if the prefix option is set to "asterisk", then using the
65-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
66-;uploads = /var/lib/asterisk/uploads/
67+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
68+;uploads = /var/spool/asterisk/uploads/
69 ;
1f5d25f5
AM		 70diff -urN asterisk-16.15.0.org/configs/samples/iax.conf.sample asterisk-16.15.0/configs/samples/iax.conf.sample
71--- asterisk-16.15.0.org/configs/samples/iax.conf.sample 2020-11-19 13:34:40.000000000 +0100
72+++ asterisk-16.15.0/configs/samples/iax.conf.sample 2020-11-27 12:44:43.374449817 +0100
7139f57f 73@@ -541,8 +541,8 @@ inkeys=freeworlddialup
e3a22b69
JK		 74 ; authentication is used, "inkeys" is a list of acceptable public keys on the
75 ; local system that can be used to authenticate the remote peer, separated by
76 ; the ":" character. "outkey" is a single, private key to use to authenticate
77-; to the other side. Public keys are named /var/lib/asterisk/keys/<name>.pub
78-; while private keys are named /var/lib/asterisk/keys/<name>.key. Private
79+; to the other side. Public keys are named /usr/share/asterisk/keys/<name>.pub
80+; while private keys are named /usr/share/asterisk/keys/<name>.key. Private
7139f57f
AM		 81 ; keys should always be 3DES encrypted. If encryption is used (applicable to
82 ; md5 and rsa only), a secret must be provided.
e3a22b69 83 ;
1f5d25f5
AM		 84diff -urN asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample asterisk-16.15.0/configs/samples/musiconhold.conf.sample
85--- asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample 2020-11-19 13:34:40.000000000 +0100
86+++ asterisk-16.15.0/configs/samples/musiconhold.conf.sample 2020-11-27 12:44:43.377783255 +0100
87@@ -36,7 +36,7 @@
e3a22b69
JK		 88 ; The path specified can be either an absolute path (starts with '/'),
89 ; or a relative path; relative paths are interpreted as being relative
90 ; to the 'astdatalibdir' in asterisk.conf, which defaults to
91-; /var/lib/asterisk.
92+; /usr/share/asterisk.
93 ;
94 ; NOTE:
95 ; If you are not using "autoload" in modules.conf, then you
1f5d25f5 96@@ -102,7 +102,7 @@
e3a22b69
JK		 97 ;mode=custom
98 ; Note that with mode=custom, a directory is not required, such as when reading
99 ; from a stream.
100-;directory=/var/lib/asterisk/mohmp3
101+;directory=/usr/share/asterisk/mohmp3
102 ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
103
104 ;[ulawstream]
1f5d25f5 105@@ -118,7 +118,7 @@
e3a22b69
JK		 106 ; choice
107 ;[solaris]
108 ;mode=custom
109-;directory=/var/lib/asterisk/mohmp3
110+;directory=/usr/share/asterisk/mohmp3
111 ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
1f5d25f5
AM		 112
113 ; By default, when res_musiconhold reloads or unloads, it sends a HUP signal
114diff -urN asterisk-16.15.0.org/configs/samples/osp.conf.sample asterisk-16.15.0/configs/samples/osp.conf.sample
115--- asterisk-16.15.0.org/configs/samples/osp.conf.sample 2020-11-19 13:34:40.000000000 +0100
116+++ asterisk-16.15.0/configs/samples/osp.conf.sample 2020-11-27 12:44:43.377783255 +0100
e3a22b69
JK		 117@@ -45,8 +45,8 @@
118 ;source=domain name or [IP address in brackets]
119 ;
120 ; Define path and file name of crypto files.
121-; The default path for crypto file is /var/lib/asterisk/keys. If no path is
122-; defined, crypto files will in /var/lib/asterisk/keys directory.
0f0650bc
GPP		 123+; The default path for crypto file is /usr/share/asterisk/keys. If no path is
124+; defined, crypto files will in /usr/share/asterisk/keys directory.
e3a22b69
JK		 125 ;
126 ; Specify the private key file name.
127 ; If this parameter is unspecified or not present, the default name will be the
1f5d25f5
AM		 128diff -urN asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample asterisk-16.15.0/configs/samples/phoneprov.conf.sample
129--- asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample 2020-11-19 13:34:40.000000000 +0100
130+++ asterisk-16.15.0/configs/samples/phoneprov.conf.sample 2020-11-27 12:44:43.377783255 +0100
a4d69967 131@@ -136,7 +136,7 @@
e3a22b69
JK		 132 ${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
133 config/${MAC} => polycom.xml ; Dynamic Filename => template file
134 ${MAC}-directory.xml => 000000000000-directory.xml
135-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable
136+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable
137
138 ;snom 300, 320, 360, 370, 820, 821, 870 support
139 snom-${MAC}.xml => snom-mac.xml
9a3291b8
AM		 140--- a/configs/samples/res_config_sqlite3.conf.sample~ 2022-10-19 16:31:39.000000000 +0200
141+++ b/configs/samples/res_config_sqlite3.conf.sample 2022-11-30 07:44:04.009791957 +0100
e3a22b69 142@@ -1,7 +1,7 @@
9a3291b8
AM		 143 ; Define a realtime database name to use in extconfig.conf
144 ;
145 ;[asterisk]
146-;dbfile => /var/lib/asterisk/realtime.sqlite3
147+;dbfile => /var/spool/asterisk/realtime.sqlite3
148 ;
149 ; debug - Turn on debugging information
150 ;debug=yes
151@@ -32,4 +32,4 @@
152 ; busy timeout - timeout in miliseconds to stop waiting for locked database.
153 ; More info at https://www.sqlite.org/c3ref/busy_timeout.html
154 ;
155-;busy_timeout=1000
156\ No newline at end of file
157+;busy_timeout=1000
1f5d25f5
AM		 158diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey asterisk-16.15.0/contrib/scripts/astgenkey
159--- asterisk-16.15.0.org/contrib/scripts/astgenkey 2020-11-19 13:34:40.000000000 +0100
160+++ asterisk-16.15.0/contrib/scripts/astgenkey 2020-11-27 12:44:43.377783255 +0100
e3a22b69
JK		 161@@ -29,7 +29,7 @@
162 echo "in PEM format for use by Asterisk. You will be asked to"
163 echo "enter a passcode for your key multiple times. Please"
164 echo "enter the same code each time. The resulting files will"
165- echo "need to be moved to /var/lib/asterisk/keys if you want"
166+ echo "need to be moved to /usr/share/asterisk/keys if you want"
167 echo "to use them, and any private keys (.key files) will"
168 echo "need to be initialized at runtime either by running"
00222a62 169 echo "Asterisk with the '-i' option, or with the 'keys init'"
1f5d25f5
AM		 170diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey.8 asterisk-16.15.0/contrib/scripts/astgenkey.8
171--- asterisk-16.15.0.org/contrib/scripts/astgenkey.8 2020-11-19 13:34:40.000000000 +0100
172+++ asterisk-16.15.0/contrib/scripts/astgenkey.8 2020-11-27 12:44:43.377783255 +0100
e3a22b69
JK		 173@@ -87,7 +87,7 @@
174 .RE
175
ebc676cd 176 Those files should be copied to
e3a22b69
JK		 177-.I /var/lib/asterisk/keys
178+.I /usr/share/asterisk/keys
179
180 (The private key: on your system. The public key: on other systems)
181
182@@ -121,10 +121,10 @@
183 And then make the key accessible to Asterisk (assuming you run it as
184 user "asterisk").
185
186- chown asterisk /var/lib/asterisk/keys/yourname.*
187+ chown asterisk /usr/share/asterisk/keys/yourname.*
188
189 .SH FILES
190-.I /var/lib/asterisk/keys
191+.I /usr/share/asterisk/keys
192 .RS
193 .RE
194
1f5d25f5
AM		 195diff -urN asterisk-16.15.0.org/contrib/utils/README.rawplayer asterisk-16.15.0/contrib/utils/README.rawplayer
196--- asterisk-16.15.0.org/contrib/utils/README.rawplayer 2020-11-19 13:34:40.000000000 +0100
197+++ asterisk-16.15.0/contrib/utils/README.rawplayer 2020-11-27 12:44:43.377783255 +0100
0f0650bc 198@@ -16,7 +16,7 @@
e3a22b69
JK		 199 sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
200
201
202-Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
203+Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
204 and set up a class in musiconhold.conf like so:
205
206 [classes]
1f5d25f5
AM		 207diff -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
208--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-test3/extensions.ael 2020-11-19 13:34:40.000000000 +0100
209+++ asterisk-16.15.0/pbx/ael/ael-test/ael-test3/extensions.ael 2020-11-27 12:44:43.377783255 +0100
6889aefb
ER		 210@@ -2049,7 +2049,7 @@
211
212 macro callerid-liar()
213 {
214- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
215+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
ebc676cd 216 Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
6889aefb
ER		 217 // faces to get in the front door, and unidentified callers won't fair
218 // any better. You entered *MY* phone number. That won't work.
219@@ -2106,7 +2106,7 @@
220 PrivacyManager();
221 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
222 {
223- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
ebc676cd 224+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
6889aefb
ER		 225 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
226 Hangup();
227 return;
228@@ -2138,7 +2138,7 @@
229 verbose(direct is XXX#${direct}XXXX);
230 Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
231 Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
232- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 233+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 234 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
235 switch(${direct})
236 {
237@@ -2223,7 +2223,7 @@
ebc676cd 238
6889aefb
ER		 239 }
240 1 => { // Sonya
241- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 242+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 243 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
244 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
245 goto s|loopback;
246@@ -2421,51 +2421,51 @@
247 Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
248 }
249 1 => { // SEAN
250- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 251+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 252 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
253 // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
254 &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
255 goto homeline|s|loopback;
256 }
257 2 => { // ERIC
258- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 259+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 260 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
261 Voicemail(u4);
262 goto homeline|s|loopback;
ebc676cd 263
6889aefb
ER		 264 // SetMusicOnHold(erics);
265- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 266+ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 267 // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
268 // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
269 // goto homeline|s|loopback;
270 }
271 3 => { // RYAN
272- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 273+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 274 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
275 &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
276 goto homeline|s|loopback;
277 }
278 4 => { // KYLE
279- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 280+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 281 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
282 &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
283 goto homeline|s|loopback;
284 }
285 5 => {
286- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 287+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 288 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
289 &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
290 goto homeline|s|loopback;
ebc676cd 291
6889aefb
ER		 292 }
293 6 => {
294- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 295+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 296 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
297 &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
298 goto homeline|s|loopback;
299 }
300 7 => {
301- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 302+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 303 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
304 &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
305 goto homeline|s|loopback;
306@@ -2517,7 +2517,7 @@
307 // Otherwise, dial 1, and hopefully, you will reach Steve.
308 }
309 1 => {
310- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 311+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb 312 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
ebc676cd 313
6889aefb
ER		 314 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
315@@ -2778,7 +2778,7 @@
316 }
317 761 => {
318 Record(announcement:gsm);
319- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
ebc676cd 320+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
6889aefb
ER		 321 goto s|loopback;
322 }
323 762 => {
1f5d25f5
AM		 324diff -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
325--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-vtest13/extensions.ael 2020-11-19 13:34:40.000000000 +0100
326+++ asterisk-16.15.0/pbx/ael/ael-test/ael-vtest13/extensions.ael 2020-11-27 12:44:43.377783255 +0100
6889aefb
ER		 327@@ -2048,7 +2048,7 @@
328
329 macro callerid-liar()
330 {
331- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
ebc676cd
GP		 332+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
333 Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
6889aefb
ER		 334 // faces to get in the front door, and unidentified callers won't fair
335 // any better. You entered *MY* phone number. That won't work.
336@@ -2105,7 +2105,7 @@
337 PrivacyManager();
338 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
339 {
340- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
ebc676cd 341+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
6889aefb
ER		 342 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
343 Hangup();
344 return;
345@@ -2137,7 +2137,7 @@
346 verbose(direct is XXX#${direct}XXXX);
347 Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
348 Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
349- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 350+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
6889aefb
ER		 351 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
352 switch(${direct})
e3a22b69
JK		 353 {
354@@ -2222,7 +2222,7 @@
ebc676cd 355
e3a22b69
JK		 356 }
357 1 => { // Sonya
358- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 359+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 360 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
361 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
362 goto s|loopback;
363@@ -2420,51 +2420,51 @@
364 Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
365 }
366 1 => { // SEAN
367- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 368+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 369 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
370 // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
371 &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
372 goto homeline|s|loopback;
373 }
374 2 => { // ERIC
375- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 376+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 377 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
378 Voicemail(u4);
379 goto homeline|s|loopback;
ebc676cd 380
e3a22b69
JK		 381 // SetMusicOnHold(erics);
382- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 383+ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 384 // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
385 // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
386 // goto homeline|s|loopback;
387 }
388 3 => { // RYAN
389- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 390+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 391 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
392 &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
393 goto homeline|s|loopback;
394 }
395 4 => { // KYLE
396- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 397+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 398 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
399 &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
400 goto homeline|s|loopback;
401 }
402 5 => {
403- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 404+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 405 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
406 &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
407 goto homeline|s|loopback;
ebc676cd 408
e3a22b69
JK		 409 }
410 6 => {
411- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 412+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 413 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
414 &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
415 goto homeline|s|loopback;
416 }
417 7 => {
418- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 419+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69
JK		 420 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
421 &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
422 goto homeline|s|loopback;
423@@ -2516,7 +2516,7 @@
424 // Otherwise, dial 1, and hopefully, you will reach Steve.
425 }
426 1 => {
427- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
ebc676cd 428+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
e3a22b69 429 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
ebc676cd 430
e3a22b69
JK		 431 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
432@@ -2777,7 +2777,7 @@
433 }
434 761 => {
435 Record(announcement:gsm);
436- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
ebc676cd 437+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
e3a22b69
JK		 438 goto s|loopback;
439 }
440 762 => {
1f5d25f5
AM		 441diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13 asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13
442--- asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13 2020-11-19 13:34:40.000000000 +0100
443+++ asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13 2020-11-27 12:44:43.381116692 +0100
e3a22b69 444@@ -2182,7 +2182,7 @@
6889aefb 445
6889aefb 446
e3a22b69
JK		 447 [callerid-liar]
448-exten => ~~s~~,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
ebc676cd 449+exten => ~~s~~,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
e3a22b69
JK		 450 exten => ~~s~~,2,Background(priv-liar)
451 exten => ~~s~~,3,Hangup()
452 exten => ~~s~~,4,Return()
453@@ -2217,7 +2217,7 @@
454 exten => s,4,Zapateller(nocallerid)
455 exten => s,5,PrivacyManager()
456 exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
457-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
ebc676cd 458+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
e3a22b69
JK		 459 exten => s,8,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
460 exten => s,9,Hangup()
461 exten => s,10,Return()
462@@ -2243,7 +2243,7 @@
463 exten => s,30,verbose(direct is XXX#${direct}XXXX)
464 exten => s,31,Playback(greetings/direct)
465 exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
466-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 467+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 468 exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
469 exten => s,35,Goto(sw_92_${direct},10)
470 exten => s,36,NoOp(Finish switch_if_homeline_91_92)
471@@ -2322,7 +2322,7 @@
472 exten => sw_92_2,11,Goto(s,loopback)
473 exten => sw_92_1,10,Gosub(std-priv-exten,~~s~~,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
474 exten => sw_92_1,11,Goto(s,loopback)
475-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 476+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 477 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
478 exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
479 exten => 1,4,Goto(s,loopback)
480@@ -2399,31 +2399,31 @@
6889aefb 481
e3a22b69
JK		 482 [homeline-kids]
483 exten => s,1(begin),Background(murphy-homeline-kids)
484-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 485+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 486 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
487 exten => 1,3,Gosub(std-priv-exten,~~s~~,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
488 exten => 1,4,Goto(homeline,s,loopback)
489-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 490+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 491 exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
492 exten => 2,3,Voicemail(u4)
493 exten => 2,4,Goto(homeline,s,loopback)
494-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 495+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 496 exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
497 exten => 3,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
498 exten => 3,4,Goto(homeline,s,loopback)
499-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 500+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 501 exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
502 exten => 4,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
503 exten => 4,4,Goto(homeline,s,loopback)
504-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 505+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 506 exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
507 exten => 5,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
508 exten => 5,4,Goto(homeline,s,loopback)
509-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 510+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 511 exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
512 exten => 6,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
513 exten => 6,4,Goto(homeline,s,loopback)
514-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 515+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 516 exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
517 exten => 7,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
518 exten => 7,4,Goto(homeline,s,loopback)
519@@ -2451,7 +2451,7 @@
520 exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
521 exten => s,7(loopback),Background(greetings/greeting)
522 exten => s,8,Background(murphy-office-intro1)
523-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
ebc676cd 524+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
e3a22b69
JK		 525 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
526 exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
527 exten => 1,4,Goto(s,loopback)
528@@ -2577,7 +2577,7 @@
529 exten => 760,1,DateTime()
530 exten => 760,2,Goto(s,loopback)
531 exten => 761,1,Record(announcement:gsm)
532-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
ebc676cd 533+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
e3a22b69
JK		 534 exten => 761,3,Goto(s,loopback)
535 exten => 762,1,agi(tts-riddle.agi)
536 exten => 762,2,Background(gsm/what-time-it-is2)
1f5d25f5
AM		 537diff -urN asterisk-16.15.0.org/utils/ael_main.c asterisk-16.15.0/utils/ael_main.c
538--- asterisk-16.15.0.org/utils/ael_main.c 2020-11-19 13:34:40.000000000 +0100
539+++ asterisk-16.15.0/utils/ael_main.c 2020-11-27 12:44:43.381116692 +0100
540@@ -525,7 +525,7 @@
6889aefb
ER		 541 strcpy(config_dir, "/etc/asterisk");
542 localized_use_conf_dir();
543 }
544- strcpy(var_dir, "/var/lib/asterisk");
a4d69967
JK		 545+ strcpy(var_dir, "/usr/share/asterisk");
546
6889aefb
ER		 547 if( dump_extensions ) {
548 dumpfile = fopen("extensions.conf.aeldump","w");
Asterisk PBX
This page took 0.1646 seconds and 4 git commands to generate.