1 Index: pbx/ael/ael-test/ref.ael-vtest13
2 ===================================================================
3 --- pbx/ael/ael-test/ref.ael-vtest13.orig 2010-10-05 02:23:11.000000000 +0300
4 +++ pbx/ael/ael-test/ref.ael-vtest13 2010-10-23 12:56:19.047483668 +0300
9 -exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
10 +exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
11 exten => s,2,Background(priv-liar)
15 exten => s,5,Zapateller(nocallerid)
16 exten => s,6,PrivacyManager()
17 exten => s,7,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?8:12)
18 -exten => s,8,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
19 +exten => s,8,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
20 exten => s,9,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
21 exten => s,10,Hangup()
22 exten => s,11,Return()
24 exten => s,31,verbose(direct is XXX#${direct}XXXX)
25 exten => s,32,Playback(greetings/direct)
26 exten => s,33,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
27 -exten => s,34,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
28 +exten => s,34,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
29 exten => s,35,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
30 exten => s,36,Goto(sw_92_${direct},10)
31 exten => s,37,NoOp(Finish switch_if_homeline_91_92)
33 exten => sw_92_2,11,Goto(s,loopback)
34 exten => sw_92_1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
35 exten => sw_92_1,11,Goto(s,loopback)
36 -exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
37 +exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
38 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
39 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
40 exten => 1,4,Goto(s,loopback)
41 @@ -2400,31 +2400,31 @@
44 exten => s,1(begin),Background(murphy-homeline-kids)
45 -exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
46 +exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
47 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
48 exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
49 exten => 1,4,Goto(homeline,s,loopback)
50 -exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
51 +exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
52 exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
53 exten => 2,3,Voicemail(u4)
54 exten => 2,4,Goto(homeline,s,loopback)
55 -exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
56 +exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
57 exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
58 exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
59 exten => 3,4,Goto(homeline,s,loopback)
60 -exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
61 +exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
62 exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
63 exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
64 exten => 4,4,Goto(homeline,s,loopback)
65 -exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
66 +exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
67 exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
68 exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
69 exten => 5,4,Goto(homeline,s,loopback)
70 -exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
71 +exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
72 exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
73 exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
74 exten => 6,4,Goto(homeline,s,loopback)
75 -exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
76 +exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
77 exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
78 exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
79 exten => 7,4,Goto(homeline,s,loopback)
81 exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
82 exten => s,7(loopback),Background(greetings/greeting)
83 exten => s,8,Background(murphy-office-intro1)
84 -exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
85 +exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
86 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
87 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
88 exten => 1,4,Goto(s,loopback)
90 exten => 760,1,DateTime()
91 exten => 760,2,Goto(s,loopback)
92 exten => 761,1,Record(announcement:gsm)
93 -exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
94 +exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
95 exten => 761,3,Goto(s,loopback)
96 exten => 762,1,agi(tts-riddle.agi)
97 exten => 762,2,Background(gsm/what-time-it-is2)
98 Index: pbx/ael/ael-test/ael-test3/extensions.ael
99 ===================================================================
100 --- pbx/ael/ael-test/ael-test3/extensions.ael (revision 222649)
101 +++ pbx/ael/ael-test/ael-test3/extensions.ael (working copy)
102 @@ -2049,7 +2049,7 @@
104 macro callerid-liar()
106 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
107 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
108 Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
109 // faces to get in the front door, and unidentified callers won't fair
110 // any better. You entered *MY* phone number. That won't work.
111 @@ -2106,7 +2106,7 @@
113 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
115 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
116 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
117 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
120 @@ -2138,7 +2138,7 @@
121 verbose(direct is XXX#${direct}XXXX);
122 Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
123 Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
124 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
125 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
126 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
129 @@ -2223,7 +2223,7 @@
133 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
134 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
135 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
136 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
138 @@ -2421,51 +2421,51 @@
139 Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
142 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
143 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
144 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
145 // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
146 &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
147 goto homeline|s|loopback;
150 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
151 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
152 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
154 goto homeline|s|loopback;
156 // SetMusicOnHold(erics);
157 - // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
158 + // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
159 // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
160 // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
161 // goto homeline|s|loopback;
164 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
165 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
166 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
167 &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
168 goto homeline|s|loopback;
171 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
172 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
173 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
174 &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
175 goto homeline|s|loopback;
178 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
179 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
180 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
181 &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
182 goto homeline|s|loopback;
186 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
187 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
188 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
189 &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
190 goto homeline|s|loopback;
193 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
194 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
195 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
196 &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
197 goto homeline|s|loopback;
198 @@ -2517,7 +2517,7 @@
199 // Otherwise, dial 1, and hopefully, you will reach Steve.
202 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
203 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
204 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
206 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
207 @@ -2778,7 +2778,7 @@
210 Record(announcement:gsm);
211 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
212 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
216 Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
217 ===================================================================
218 --- pbx/ael/ael-test/ael-vtest13/extensions.ael (revision 222649)
219 +++ pbx/ael/ael-test/ael-vtest13/extensions.ael (working copy)
220 @@ -2048,7 +2048,7 @@
222 macro callerid-liar()
224 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
225 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
226 Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
227 // faces to get in the front door, and unidentified callers won't fair
228 // any better. You entered *MY* phone number. That won't work.
229 @@ -2105,7 +2105,7 @@
231 if( "${PRIVACYMGRSTATUS}" = "FAILED" )
233 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
234 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
235 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
238 @@ -2137,7 +2137,7 @@
239 verbose(direct is XXX#${direct}XXXX);
240 Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
241 Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
242 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
243 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
244 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
247 @@ -2222,7 +2222,7 @@
251 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
252 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
253 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
254 &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
256 @@ -2420,51 +2420,51 @@
257 Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
260 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
261 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
262 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
263 // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
264 &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
265 goto homeline|s|loopback;
268 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
269 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
270 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
272 goto homeline|s|loopback;
274 // SetMusicOnHold(erics);
275 - // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
276 + // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
277 // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
278 // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
279 // goto homeline|s|loopback;
282 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
283 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
284 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
285 &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
286 goto homeline|s|loopback;
289 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
290 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
291 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
292 &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
293 goto homeline|s|loopback;
296 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
297 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
298 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
299 &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
300 goto homeline|s|loopback;
304 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
305 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
306 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
307 &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
308 goto homeline|s|loopback;
311 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
312 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
313 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
314 &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
315 goto homeline|s|loopback;
316 @@ -2516,7 +2516,7 @@
317 // Otherwise, dial 1, and hopefully, you will reach Steve.
320 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
321 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
322 TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
324 &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
325 @@ -2777,7 +2777,7 @@
328 Record(announcement:gsm);
329 - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
330 + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
334 Index: agi/jukebox.agi
335 ===================================================================
336 --- agi/jukebox.agi (revision 222649)
337 +++ agi/jukebox.agi (working copy)
340 # Uses festival to list off all your MP3 music files over a channel in
341 # a hierarchical fashion. Put this file in your agi-bin folder which
342 -# is located at: /var/lib/asterisk/agi-bin Be sure to chmod +x it!
343 +# is located at: /usr/share/asterisk/agi-bin Be sure to chmod +x it!
345 # Invocation Example:
346 # exten => 68742,1,Answer()
347 Index: agi/DialAnMp3.agi
348 ===================================================================
349 --- agi/DialAnMp3.agi (revision 222649)
350 +++ agi/DialAnMp3.agi (working copy)
352 print STDERR " -- $i = $AGI{$i}\n";
355 -dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
356 +dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
360 Index: agi/numeralize
361 ===================================================================
362 --- agi/numeralize (revision 222649)
363 +++ agi/numeralize (working copy)
366 $mp3dir="/usr/media/mpeg3";
368 -dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
369 +dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
373 Index: apps/app_rpt.c
374 ===================================================================
375 --- apps/app_rpt.c (revision 222649)
376 +++ apps/app_rpt.c (working copy)
378 #define TONEMACRO "tonemacro"
381 -#define EXTNODEFILE "/var/lib/asterisk/rpt_extnodes"
382 +#define EXTNODEFILE "/usr/share/asterisk/rpt_extnodes"
383 #define NODENAMES "rpt/nodenames"
384 #define PARROTFILE "/tmp/parrot_%s_%u"
387 ===================================================================
388 --- doc/osp.txt (revision 222649)
389 +++ doc/osp.txt (working copy)
391 Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin).
393 2.2 Obtain Crypto Files
394 -The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.
395 +The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.
397 Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
401 The certificate request was successful.
402 Error Code returned from localcert command : 0
403 -The files generated should be copied to the /var/lib/asterisk/keys directory.
404 +The files generated should be copied to the /usr/share/asterisk/keys directory.
405 Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
411 ; Define path and file name of crypto files.
412 -; The default path for crypto file is /var/lib/asterisk/keys. If no
413 +; The default path for crypto file is /usr/share/asterisk/keys. If no
414 ; path is defined, crypto files should be in
415 -; /var/lib/asterisk/keys directory.
416 +; /usr/share/asterisk/keys directory.
418 ; Specify the private key file name.
419 ; If this parameter is unspecified or not present, the default name
420 Index: doc/tex/phoneprov.tex
421 ===================================================================
422 --- doc/tex/phoneprov.tex (revision 222649)
423 +++ doc/tex/phoneprov.tex (working copy)
426 staticdir => configs/
427 mime_type => text/xml
428 -setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
429 +setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
430 static_file => bootrom.ld,application/octet-stream
431 static_file => bootrom.ver,plain/text
432 static_file => sip.ld,application/octet-stream
433 Index: doc/tex/ael.tex
434 ===================================================================
435 --- doc/tex/ael.tex (revision 222649)
436 +++ doc/tex/ael.tex (working copy)
437 @@ -1167,7 +1167,7 @@
438 the application that would set that variable is not called in
439 the same extension. This is a warning only...
440 \item Calls to applications not in the "applist" database (installed
441 - in \path{/var/lib/asterisk/applist}" on most systems).
442 + in \path{/usr/share/asterisk/applist}" on most systems).
443 \item In an assignment statement, if the assignment is to a function,
444 the function name used is checked to see if it one of the
445 currently known functions. A warning is issued if it is not.
446 Index: doc/tex/asterisk-conf.tex
447 ===================================================================
448 --- doc/tex/asterisk-conf.tex (revision 222649)
449 +++ doc/tex/asterisk-conf.tex (working copy)
451 astmoddir => /usr/lib/asterisk/modules
453 ; Where additional 'library' elements (scripts, etc.) are located
454 -astvarlibdir => /var/lib/asterisk
455 +astvarlibdir => /usr/share/asterisk
457 ; Where AGI scripts/programs are located
458 -astagidir => /var/lib/asterisk/agi-bin
459 +astagidir => /usr/share/asterisk/agi-bin
461 ; Where spool directories are located
462 ; Voicemail, monitor, dictation and other apps will create files here
463 Index: doc/tex/privacy.tex
464 ===================================================================
465 --- doc/tex/privacy.tex (revision 222649)
466 +++ doc/tex/privacy.tex (working copy)
469 When there is no CallerID, P and p options will always record an intro
470 for the incoming caller. This intro will be stored temporarily in the
471 -\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
472 +\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
473 NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
474 callee decides what to do with the call.
477 \subsubsection{Introductions}
478 Unless instructed to not save introductions (see the 'n' option above),
479 the screening modes will save the recordings of the caller's names in
480 -the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
481 +the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
482 a CallerID. Just the 10-digit callerid numbers are used as filenames,
483 with a ".gsm" at the end.
489 -exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
490 +exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
491 exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
494 Index: configs/iax.conf.sample
495 ===================================================================
496 --- configs/iax.conf.sample (revision 222649)
497 +++ configs/iax.conf.sample (working copy)
499 ; authentication is used, "inkeys" is a list of acceptable public keys on the
500 ; local system that can be used to authenticate the remote peer, separated by
501 ; the ":" character. "outkey" is a single, private key to use to authenticate
502 -; to the other side. Public keys are named /var/lib/asterisk/keys/<name>.pub
503 -; while private keys are named /var/lib/asterisk/keys/<name>.key. Private
504 +; to the other side. Public keys are named /usr/share/asterisk/keys/<name>.pub
505 +; while private keys are named /usr/share/asterisk/keys/<name>.key. Private
506 ; keys should always be 3DES encrypted.
509 Index: configs/festival.conf.sample
510 ===================================================================
511 --- configs/festival.conf.sample (revision 222649)
512 +++ configs/festival.conf.sample (working copy)
514 ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
517 -;cachedir=/var/lib/asterisk/festivalcache/
518 +;cachedir=/var/spool/asterisk/festival/
520 ; Festival command to send to the server.
521 ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
522 Index: configs/http.conf.sample
523 ===================================================================
524 --- configs/http.conf.sample (revision 222649)
525 +++ configs/http.conf.sample (working copy)
527 ; Note about Asterisk documentation:
528 ; If Asterisk was installed from a tarball, then the HTML documentation should
529 ; be installed in the static-http/docs directory which is
530 -; (/var/lib/asterisk/static-http/docs) on linux by default. If the Asterisk
531 +; (/usr/share/asterisk/static-http/docs) on linux by default. If the Asterisk
532 ; HTTP server is enabled in this file by setting the "enabled", "bindaddr",
533 ; and "bindport" options, then you should be able to view the documentation
534 ; remotely by browsing to:
538 ; In this example, if the prefix option is set to "asterisk", then using the
539 -; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
540 -;uploads = /var/lib/asterisk/uploads/
541 +; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
542 +;uploads = /var/spool/asterisk/uploads/
544 Index: configs/phoneprov.conf.sample
545 ===================================================================
546 --- configs/phoneprov.conf.sample (revision 222649)
547 +++ configs/phoneprov.conf.sample (working copy)
549 ${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
550 config/${MAC} => polycom.xml ; Dynamic Filename => template file
551 ${MAC}-directory.xml => 000000000000-directory.xml
552 -setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable
553 +setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable
554 Index: configs/musiconhold.conf.sample
555 ===================================================================
556 --- configs/musiconhold.conf.sample.orig 2010-10-16 13:47:00.000000000 +0300
557 +++ configs/musiconhold.conf.sample 2010-10-23 13:01:47.124150334 +0300
559 ; The path specified can be either an absolute path (starts with '/'),
560 ; or a relative path; relative paths are interpreted as being relative
561 ; to the 'astdatalibdir' in asterisk.conf, which defaults to
562 -; /var/lib/asterisk.
563 +; /usr/share/asterisk.
566 ; If you are not using "autoload" in modules.conf, then you
569 ; Note that with mode=custom, a directory is not required, such as when reading
571 -;directory=/var/lib/asterisk/mohmp3
572 +;directory=/usr/share/asterisk/mohmp3
573 ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
580 -;directory=/var/lib/asterisk/mohmp3
581 +;directory=/usr/share/asterisk/mohmp3
582 ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
583 Index: configs/osp.conf.sample
584 ===================================================================
585 --- configs/osp.conf.sample.orig 2010-07-12 07:16:18.000000000 +0300
586 +++ configs/osp.conf.sample 2010-10-23 13:00:01.017483668 +0300
588 ;source=domain name or [IP address in brackets]
590 ; Define path and file name of crypto files.
591 -; The default path for crypto file is /var/lib/asterisk/keys. If no path is
592 -; defined, crypto files will in /var/lib/asterisk/keys directory.
593 +; The default path for crypto file is /user/share/asterisk/keys. If no path is
594 +; defined, crypto files will in /user/share/asterisk/keys directory.
596 ; Specify the private key file name.
597 ; If this parameter is unspecified or not present, the default name will be the
598 Index: configs/res_config_sqlite.conf.sample
599 ===================================================================
600 --- configs/res_config_sqlite.conf.sample (revision 222649)
601 +++ configs/res_config_sqlite.conf.sample (working copy)
606 -dbfile => /var/lib/asterisk/sqlite.db
607 +dbfile => /var/spool/asterisk/sqlite.db
609 ; Both config_table and cdr_table are optional. If config_table is omitted,
610 ; you must specify it in extconfig.conf. If it is both provided here and in
611 Index: utils/ael_main.c
612 ===================================================================
613 --- utils/ael_main.c (revision 222649)
614 +++ utils/ael_main.c (working copy)
616 strcpy(config_dir, "/etc/asterisk");
617 localized_use_conf_dir();
619 - strcpy(var_dir, "/var/lib/asterisk");
620 + strcpy(var_dir, "/usr/share/asterisk");
622 if( dump_extensions ) {
623 dumpfile = fopen("extensions.conf.aeldump","w");
624 Index: contrib/scripts/astgenkey.8
625 ===================================================================
626 --- contrib/scripts/astgenkey.8 (revision 222649)
627 +++ contrib/scripts/astgenkey.8 (working copy)
631 Those files should be copied to
632 -.I /var/lib/asterisk/keys
633 +.I /usr/share/asterisk/keys
635 (The private key: on your system. The public key: on other systems)
637 @@ -122,10 +122,10 @@
638 And then make the key accessible to Asterisk (assuming you run it as
641 - chown asterisk /var/lib/asterisk/keys/yourname.*
642 + chown asterisk /usr/share/asterisk/keys/yourname.*
645 -.I /var/lib/asterisk/keys
646 +.I /usr/share/asterisk/keys
650 Index: contrib/scripts/astgenkey
651 ===================================================================
652 --- contrib/scripts/astgenkey (revision 222649)
653 +++ contrib/scripts/astgenkey (working copy)
655 echo "in PEM format for use by Asterisk. You will be asked to"
656 echo "enter a passcode for your key multiple times. Please"
657 echo "enter the same code each time. The resulting files will"
658 - echo "need to be moved to /var/lib/asterisk/keys if you want"
659 + echo "need to be moved to /usr/share/asterisk/keys if you want"
660 echo "to use them, and any private keys (.key files) will"
661 echo "need to be initialized at runtime either by running"
662 echo "Asterisk with the '-i' option, or with the 'init keys'"
663 Index: contrib/utils/README.rawplayer
664 ===================================================================
665 --- contrib/utils/README.rawplayer (revision 222649)
666 +++ contrib/utils/README.rawplayer (working copy)
668 sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
671 -Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
672 +Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
673 and set up a class in musiconhold.conf like so:
676 -default => custom:/var/lib/asterisk/holdmusic_raw,/usr/bin/rawplayer
677 +default => custom:/usr/share/asterisk/holdmusic_raw,/usr/bin/rawplayer
680 This is the most efficient way to implement moh because no cpu usage is required to
681 Index: UPGRADE-1.4.txt
682 ===================================================================
683 --- UPGRADE-1.4.txt (revision 222649)
684 +++ UPGRADE-1.4.txt (working copy)
686 WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
687 instead of the alternate-language files being stored in subdirectories underneath
688 the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
689 -etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
690 +etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
691 language itself, then places all the sound files for that language under that
692 directory and its subdirectories. This is the layout that will be created if you
693 select non-English languages to be installed via menuselect, HOWEVER Asterisk does