]> git.pld-linux.org Git - packages/asterisk.git/blame - FHS-paths.patch
Version: 14.5.0
[packages/asterisk.git] / FHS-paths.patch
CommitLineData
a4d69967
JK
1diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/DialAnMp3.agi asterisk-14.5.0/agi/DialAnMp3.agi
2--- asterisk-14.5.0.orig/agi/DialAnMp3.agi 2017-05-30 19:50:46.000000000 +0200
3+++ asterisk-14.5.0/agi/DialAnMp3.agi 2017-06-09 14:40:59.000000000 +0200
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) = @_;
a4d69967
JK
13diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/jukebox.agi asterisk-14.5.0/agi/jukebox.agi
14--- asterisk-14.5.0.orig/agi/jukebox.agi 2017-05-30 19:50:46.000000000 +0200
15+++ asterisk-14.5.0/agi/jukebox.agi 2017-06-09 14:40:59.000000000 +0200
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()
a4d69967
JK
25diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/numeralize asterisk-14.5.0/agi/numeralize
26--- asterisk-14.5.0.orig/agi/numeralize 2017-05-30 19:50:46.000000000 +0200
27+++ asterisk-14.5.0/agi/numeralize 2017-06-09 14:40:59.000000000 +0200
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;
a4d69967
JK
37diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/festival.conf.sample asterisk-14.5.0/configs/samples/festival.conf.sample
38--- asterisk-14.5.0.orig/configs/samples/festival.conf.sample 2017-05-30 19:50:46.000000000 +0200
39+++ asterisk-14.5.0/configs/samples/festival.conf.sample 2017-06-09 14:40:59.000000000 +0200
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
a4d69967
JK
49diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/http.conf.sample asterisk-14.5.0/configs/samples/http.conf.sample
50--- asterisk-14.5.0.orig/configs/samples/http.conf.sample 2017-05-30 19:50:46.000000000 +0200
51+++ asterisk-14.5.0/configs/samples/http.conf.sample 2017-06-09 14:40:59.000000000 +0200
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:
a4d69967 61@@ -121,6 +121,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 ;
a4d69967
JK
70diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/iax.conf.sample asterisk-14.5.0/configs/samples/iax.conf.sample
71--- asterisk-14.5.0.orig/configs/samples/iax.conf.sample 2017-05-30 19:50:46.000000000 +0200
72+++ asterisk-14.5.0/configs/samples/iax.conf.sample 2017-06-09 14:40:59.000000000 +0200
73@@ -531,8 +531,8 @@
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
81 ; keys should always be 3DES encrypted.
82 ;
83 ;
a4d69967
JK
84diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/musiconhold.conf.sample asterisk-14.5.0/configs/samples/musiconhold.conf.sample
85--- asterisk-14.5.0.orig/configs/samples/musiconhold.conf.sample 2017-05-30 19:50:46.000000000 +0200
86+++ asterisk-14.5.0/configs/samples/musiconhold.conf.sample 2017-06-09 14:40:59.000000000 +0200
87@@ -35,7 +35,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
a4d69967 96@@ -79,7 +79,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]
a4d69967 105@@ -95,5 +95,5 @@
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
a4d69967
JK
112diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/osp.conf.sample asterisk-14.5.0/configs/samples/osp.conf.sample
113--- asterisk-14.5.0.orig/configs/samples/osp.conf.sample 2017-05-30 19:50:46.000000000 +0200
114+++ asterisk-14.5.0/configs/samples/osp.conf.sample 2017-06-09 14:40:59.000000000 +0200
e3a22b69
JK
115@@ -45,8 +45,8 @@
116 ;source=domain name or [IP address in brackets]
117 ;
118 ; Define path and file name of crypto files.
119-; The default path for crypto file is /var/lib/asterisk/keys. If no path is
120-; defined, crypto files will in /var/lib/asterisk/keys directory.
0f0650bc
GPP
121+; The default path for crypto file is /usr/share/asterisk/keys. If no path is
122+; defined, crypto files will in /usr/share/asterisk/keys directory.
e3a22b69
JK
123 ;
124 ; Specify the private key file name.
125 ; If this parameter is unspecified or not present, the default name will be the
a4d69967
JK
126diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/phoneprov.conf.sample asterisk-14.5.0/configs/samples/phoneprov.conf.sample
127--- asterisk-14.5.0.orig/configs/samples/phoneprov.conf.sample 2017-05-30 19:50:46.000000000 +0200
128+++ asterisk-14.5.0/configs/samples/phoneprov.conf.sample 2017-06-09 14:40:59.000000000 +0200
129@@ -136,7 +136,7 @@
e3a22b69
JK
130 ${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
131 config/${MAC} => polycom.xml ; Dynamic Filename => template file
132 ${MAC}-directory.xml => 000000000000-directory.xml
133-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable
134+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable
135
136 ;snom 300, 320, 360, 370, 820, 821, 870 support
137 snom-${MAC}.xml => snom-mac.xml
a4d69967
JK
138diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/res_config_sqlite.conf.sample asterisk-14.5.0/configs/samples/res_config_sqlite.conf.sample
139--- asterisk-14.5.0.orig/configs/samples/res_config_sqlite.conf.sample 2017-05-30 19:50:46.000000000 +0200
140+++ asterisk-14.5.0/configs/samples/res_config_sqlite.conf.sample 2017-06-09 14:40:59.000000000 +0200
e3a22b69
JK
141@@ -1,7 +1,7 @@
142 [general]
143
144 ; The database file.
145-dbfile => /var/lib/asterisk/sqlite.db
146+dbfile => /var/spool/asterisk/sqlite.db
147
148 ; Both config_table and cdr_table are optional. If config_table is omitted,
149 ; you must specify it in extconfig.conf. If it is both provided here and in
a4d69967
JK
150diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/scripts/astgenkey asterisk-14.5.0/contrib/scripts/astgenkey
151--- asterisk-14.5.0.orig/contrib/scripts/astgenkey 2017-05-30 19:50:46.000000000 +0200
152+++ asterisk-14.5.0/contrib/scripts/astgenkey 2017-06-09 14:40:59.000000000 +0200
e3a22b69
JK
153@@ -29,7 +29,7 @@
154 echo "in PEM format for use by Asterisk. You will be asked to"
155 echo "enter a passcode for your key multiple times. Please"
156 echo "enter the same code each time. The resulting files will"
157- echo "need to be moved to /var/lib/asterisk/keys if you want"
158+ echo "need to be moved to /usr/share/asterisk/keys if you want"
159 echo "to use them, and any private keys (.key files) will"
160 echo "need to be initialized at runtime either by running"
00222a62 161 echo "Asterisk with the '-i' option, or with the 'keys init'"
a4d69967
JK
162diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/scripts/astgenkey.8 asterisk-14.5.0/contrib/scripts/astgenkey.8
163--- asterisk-14.5.0.orig/contrib/scripts/astgenkey.8 2017-05-30 19:50:46.000000000 +0200
164+++ asterisk-14.5.0/contrib/scripts/astgenkey.8 2017-06-09 14:40:59.000000000 +0200
e3a22b69
JK
165@@ -87,7 +87,7 @@
166 .RE
167
168 Those files should be copied to
169-.I /var/lib/asterisk/keys
170+.I /usr/share/asterisk/keys
171
172 (The private key: on your system. The public key: on other systems)
173
174@@ -121,10 +121,10 @@
175 And then make the key accessible to Asterisk (assuming you run it as
176 user "asterisk").
177
178- chown asterisk /var/lib/asterisk/keys/yourname.*
179+ chown asterisk /usr/share/asterisk/keys/yourname.*
180
181 .SH FILES
182-.I /var/lib/asterisk/keys
183+.I /usr/share/asterisk/keys
184 .RS
185 .RE
186
a4d69967
JK
187diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/utils/README.rawplayer asterisk-14.5.0/contrib/utils/README.rawplayer
188--- asterisk-14.5.0.orig/contrib/utils/README.rawplayer 2017-05-30 19:50:46.000000000 +0200
189+++ asterisk-14.5.0/contrib/utils/README.rawplayer 2017-06-09 14:40:59.000000000 +0200
0f0650bc 190@@ -16,7 +16,7 @@
e3a22b69
JK
191 sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
192
193
194-Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
195+Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
196 and set up a class in musiconhold.conf like so:
197
198 [classes]
a4d69967
JK
199diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-14.5.0/pbx/ael/ael-test/ael-test3/extensions.ael
200--- asterisk-14.5.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael 2017-05-30 19:50:46.000000000 +0200
201+++ asterisk-14.5.0/pbx/ael/ael-test/ael-test3/extensions.ael 2017-06-09 14:40:59.000000000 +0200
6889aefb
ER
202@@ -2049,7 +2049,7 @@
203
204 macro callerid-liar()
205 {
206- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
207+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
208 Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
209 // faces to get in the front door, and unidentified callers won't fair
210 // any better. You entered *MY* phone number. That won't work.
211@@ -2106,7 +2106,7 @@
212 PrivacyManager();
213 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
214 {
215- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
0f0650bc 216+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm);
6889aefb
ER
217 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
218 Hangup();
219 return;
220@@ -2138,7 +2138,7 @@
221 verbose(direct is XXX#${direct}XXXX);
222 Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
223 Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
224- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 225+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
226 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
227 switch(${direct})
228 {
229@@ -2223,7 +2223,7 @@
230
231 }
232 1 => { // Sonya
233- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 234+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
235 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
236 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
237 goto s|loopback;
238@@ -2421,51 +2421,51 @@
239 Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
240 }
241 1 => { // SEAN
242- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 243+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
244 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
245 // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
246 &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
247 goto homeline|s|loopback;
248 }
249 2 => { // ERIC
250- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 251+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
252 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
253 Voicemail(u4);
254 goto homeline|s|loopback;
255
256 // SetMusicOnHold(erics);
257- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 258+ // TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
259 // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
260 // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
261 // goto homeline|s|loopback;
262 }
263 3 => { // RYAN
264- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 265+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
266 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
267 &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
268 goto homeline|s|loopback;
269 }
270 4 => { // KYLE
271- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 272+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
273 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
274 &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
275 goto homeline|s|loopback;
276 }
277 5 => {
278- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 279+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
280 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
281 &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
282 goto homeline|s|loopback;
283
284 }
285 6 => {
286- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 287+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
288 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
289 &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
290 goto homeline|s|loopback;
291 }
292 7 => {
293- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 294+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
295 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
296 &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
297 goto homeline|s|loopback;
298@@ -2517,7 +2517,7 @@
299 // Otherwise, dial 1, and hopefully, you will reach Steve.
300 }
301 1 => {
302- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 303+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
304 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
305
306 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
307@@ -2778,7 +2778,7 @@
308 }
309 761 => {
310 Record(announcement:gsm);
311- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
0f0650bc 312+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&);
6889aefb
ER
313 goto s|loopback;
314 }
315 762 => {
a4d69967
JK
316diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-14.5.0/pbx/ael/ael-test/ael-vtest13/extensions.ael
317--- asterisk-14.5.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael 2017-05-30 19:50:46.000000000 +0200
318+++ asterisk-14.5.0/pbx/ael/ael-test/ael-vtest13/extensions.ael 2017-06-09 14:40:59.000000000 +0200
6889aefb
ER
319@@ -2048,7 +2048,7 @@
320
321 macro callerid-liar()
322 {
323- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
0f0650bc 324+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/priv-callerintros/LIAR.gsm&);
6889aefb
ER
325 Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
326 // faces to get in the front door, and unidentified callers won't fair
327 // any better. You entered *MY* phone number. That won't work.
328@@ -2105,7 +2105,7 @@
329 PrivacyManager();
330 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
331 {
332- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
0f0650bc 333+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm);
6889aefb
ER
334 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
335 Hangup();
336 return;
337@@ -2137,7 +2137,7 @@
338 verbose(direct is XXX#${direct}XXXX);
339 Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
340 Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
341- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 342+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
6889aefb
ER
343 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
344 switch(${direct})
e3a22b69
JK
345 {
346@@ -2222,7 +2222,7 @@
347
348 }
349 1 => { // Sonya
350- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 351+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
352 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
353 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
354 goto s|loopback;
355@@ -2420,51 +2420,51 @@
356 Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
357 }
358 1 => { // SEAN
359- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 360+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
361 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
362 // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
363 &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
364 goto homeline|s|loopback;
365 }
366 2 => { // ERIC
367- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 368+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
369 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
370 Voicemail(u4);
371 goto homeline|s|loopback;
372
373 // SetMusicOnHold(erics);
374- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 375+ // TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
376 // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
377 // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
378 // goto homeline|s|loopback;
379 }
380 3 => { // RYAN
381- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 382+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
383 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
384 &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
385 goto homeline|s|loopback;
386 }
387 4 => { // KYLE
388- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 389+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
390 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
391 &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
392 goto homeline|s|loopback;
393 }
394 5 => {
395- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 396+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
397 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
398 &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
399 goto homeline|s|loopback;
400
401 }
402 6 => {
403- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 404+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
405 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
406 &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
407 goto homeline|s|loopback;
408 }
409 7 => {
410- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 411+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
412 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
413 &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
414 goto homeline|s|loopback;
415@@ -2516,7 +2516,7 @@
416 // Otherwise, dial 1, and hopefully, you will reach Steve.
417 }
418 1 => {
419- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
0f0650bc 420+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
e3a22b69
JK
421 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
422
423 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
424@@ -2777,7 +2777,7 @@
425 }
426 761 => {
427 Record(announcement:gsm);
428- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
0f0650bc 429+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&);
e3a22b69
JK
430 goto s|loopback;
431 }
432 762 => {
a4d69967
JK
433diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/ref.ael-vtest13 asterisk-14.5.0/pbx/ael/ael-test/ref.ael-vtest13
434--- asterisk-14.5.0.orig/pbx/ael/ael-test/ref.ael-vtest13 2017-05-30 19:50:46.000000000 +0200
435+++ asterisk-14.5.0/pbx/ael/ael-test/ref.ael-vtest13 2017-06-09 14:40:59.000000000 +0200
e3a22b69 436@@ -2182,7 +2182,7 @@
6889aefb 437
6889aefb 438
e3a22b69
JK
439 [callerid-liar]
440-exten => ~~s~~,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
0f0650bc 441+exten => ~~s~~,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/priv-callerintros/LIAR.gsm&)
e3a22b69
JK
442 exten => ~~s~~,2,Background(priv-liar)
443 exten => ~~s~~,3,Hangup()
444 exten => ~~s~~,4,Return()
445@@ -2217,7 +2217,7 @@
446 exten => s,4,Zapateller(nocallerid)
447 exten => s,5,PrivacyManager()
448 exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
449-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
0f0650bc 450+exten => s,7,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm)
e3a22b69
JK
451 exten => s,8,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
452 exten => s,9,Hangup()
453 exten => s,10,Return()
454@@ -2243,7 +2243,7 @@
455 exten => s,30,verbose(direct is XXX#${direct}XXXX)
456 exten => s,31,Playback(greetings/direct)
457 exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
458-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 459+exten => s,33,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
460 exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
461 exten => s,35,Goto(sw_92_${direct},10)
462 exten => s,36,NoOp(Finish switch_if_homeline_91_92)
463@@ -2322,7 +2322,7 @@
464 exten => sw_92_2,11,Goto(s,loopback)
465 exten => sw_92_1,10,Gosub(std-priv-exten,~~s~~,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
466 exten => sw_92_1,11,Goto(s,loopback)
467-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 468+exten => 1,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
469 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
470 exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
471 exten => 1,4,Goto(s,loopback)
472@@ -2399,31 +2399,31 @@
6889aefb 473
e3a22b69
JK
474 [homeline-kids]
475 exten => s,1(begin),Background(murphy-homeline-kids)
476-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 477+exten => 1,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
478 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
479 exten => 1,3,Gosub(std-priv-exten,~~s~~,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
480 exten => 1,4,Goto(homeline,s,loopback)
481-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 482+exten => 2,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
483 exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
484 exten => 2,3,Voicemail(u4)
485 exten => 2,4,Goto(homeline,s,loopback)
486-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 487+exten => 3,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
488 exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
489 exten => 3,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
490 exten => 3,4,Goto(homeline,s,loopback)
491-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 492+exten => 4,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
493 exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
494 exten => 4,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
495 exten => 4,4,Goto(homeline,s,loopback)
496-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 497+exten => 5,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
498 exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
499 exten => 5,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
500 exten => 5,4,Goto(homeline,s,loopback)
501-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 502+exten => 6,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
503 exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
504 exten => 6,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
505 exten => 6,4,Goto(homeline,s,loopback)
506-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 507+exten => 7,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
508 exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
509 exten => 7,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
510 exten => 7,4,Goto(homeline,s,loopback)
511@@ -2451,7 +2451,7 @@
512 exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
513 exten => s,7(loopback),Background(greetings/greeting)
514 exten => s,8,Background(murphy-office-intro1)
515-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
0f0650bc 516+exten => 1,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
e3a22b69
JK
517 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
518 exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
519 exten => 1,4,Goto(s,loopback)
520@@ -2577,7 +2577,7 @@
521 exten => 760,1,DateTime()
522 exten => 760,2,Goto(s,loopback)
523 exten => 761,1,Record(announcement:gsm)
524-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
0f0650bc 525+exten => 761,2,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&)
e3a22b69
JK
526 exten => 761,3,Goto(s,loopback)
527 exten => 762,1,agi(tts-riddle.agi)
528 exten => 762,2,Background(gsm/what-time-it-is2)
a4d69967
JK
529diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/UPGRADE-1.4.txt asterisk-14.5.0/UPGRADE-1.4.txt
530--- asterisk-14.5.0.orig/UPGRADE-1.4.txt 2017-05-30 19:50:46.000000000 +0200
531+++ asterisk-14.5.0/UPGRADE-1.4.txt 2017-06-09 14:40:59.000000000 +0200
0f0650bc
GPP
532@@ -92,7 +92,7 @@
533 WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
534 instead of the alternate-language files being stored in subdirectories underneath
535 the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
536-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
537+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
538 language itself, then places all the sound files for that language under that
539 directory and its subdirectories. This is the layout that will be created if you
540 select non-English languages to be installed via menuselect, HOWEVER Asterisk does
a4d69967
JK
541diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/utils/ael_main.c asterisk-14.5.0/utils/ael_main.c
542--- asterisk-14.5.0.orig/utils/ael_main.c 2017-05-30 19:50:46.000000000 +0200
543+++ asterisk-14.5.0/utils/ael_main.c 2017-06-09 14:41:43.000000000 +0200
00222a62 544@@ -532,7 +532,7 @@
6889aefb
ER
545 strcpy(config_dir, "/etc/asterisk");
546 localized_use_conf_dir();
547 }
548- strcpy(var_dir, "/var/lib/asterisk");
a4d69967
JK
549+ strcpy(var_dir, "/usr/share/asterisk");
550
6889aefb
ER
551 if( dump_extensions ) {
552 dumpfile = fopen("extensions.conf.aeldump","w");
This page took 0.191752 seconds and 4 git commands to generate.