]>
Commit | Line | Data |
---|---|---|
6889aefb ER |
1 | Index: pbx/ael/ael-test/ref.ael-vtest13 |
2 | =================================================================== | |
313d7fe1 | 3 | --- pbx/ael/ael-test/ref.ael-vtest13.orig 2010-12-22 20:05:02.000000000 +0000 |
4 | +++ pbx/ael/ael-test/ref.ael-vtest13 2011-04-17 18:23:22.190000784 +0000 | |
b16f228f | 5 | @@ -2182,7 +2182,7 @@ |
6889aefb ER |
6 | |
7 | ||
8 | [callerid-liar] | |
313d7fe1 | 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) | |
12 | exten => ~~s~~,3,Hangup() | |
13 | exten => ~~s~~,4,Return() | |
14 | @@ -2217,7 +2217,7 @@ | |
15 | exten => s,4,Zapateller(nocallerid) | |
16 | exten => s,5,PrivacyManager() | |
17 | exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11) | |
18 | -exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm) | |
19 | +exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm) | |
20 | exten => s,8,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) | |
21 | exten => s,9,Hangup() | |
22 | exten => s,10,Return() | |
23 | @@ -2243,7 +2243,7 @@ | |
24 | exten => s,30,verbose(direct is XXX#${direct}XXXX) | |
25 | exten => s,31,Playback(greetings/direct) | |
26 | exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet) | |
27 | -exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm) | |
28 | +exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm) | |
29 | exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&) | |
30 | exten => s,35,Goto(sw_92_${direct},10) | |
31 | exten => s,36,NoOp(Finish switch_if_homeline_91_92) | |
32 | @@ -2322,7 +2322,7 @@ | |
b16f228f | 33 | exten => sw_92_2,11,Goto(s,loopback) |
313d7fe1 | 34 | exten => sw_92_1,10,Gosub(std-priv-exten,~~s~~,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket)) |
b16f228f | 35 | exten => sw_92_1,11,Goto(s,loopback) |
6889aefb ER |
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&) | |
313d7fe1 | 39 | exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) |
6889aefb | 40 | exten => 1,4,Goto(s,loopback) |
313d7fe1 | 41 | @@ -2399,31 +2399,31 @@ |
6889aefb ER |
42 | |
43 | [homeline-kids] | |
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&) | |
313d7fe1 | 48 | exten => 1,3,Gosub(std-priv-exten,~~s~~,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket)) |
6889aefb ER |
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&) | |
313d7fe1 | 58 | exten => 3,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket)) |
6889aefb ER |
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&) | |
313d7fe1 | 63 | exten => 4,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket)) |
6889aefb ER |
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&) | |
313d7fe1 | 68 | exten => 5,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket)) |
6889aefb ER |
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&) | |
313d7fe1 | 73 | exten => 6,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket)) |
6889aefb ER |
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&) | |
313d7fe1 | 78 | exten => 7,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket)) |
6889aefb | 79 | exten => 7,4,Goto(homeline,s,loopback) |
313d7fe1 | 80 | @@ -2451,7 +2451,7 @@ |
6889aefb ER |
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&) | |
313d7fe1 | 87 | exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket)) |
6889aefb | 88 | exten => 1,4,Goto(s,loopback) |
313d7fe1 | 89 | @@ -2577,7 +2577,7 @@ |
6889aefb ER |
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) | |
313d7fe1 | 98 | |
6889aefb ER |
99 | Index: pbx/ael/ael-test/ael-test3/extensions.ael |
100 | =================================================================== | |
101 | --- pbx/ael/ael-test/ael-test3/extensions.ael (revision 222649) | |
102 | +++ pbx/ael/ael-test/ael-test3/extensions.ael (working copy) | |
103 | @@ -2049,7 +2049,7 @@ | |
104 | ||
105 | macro callerid-liar() | |
106 | { | |
107 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&); | |
108 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&); | |
109 | Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their | |
110 | // faces to get in the front door, and unidentified callers won't fair | |
111 | // any better. You entered *MY* phone number. That won't work. | |
112 | @@ -2106,7 +2106,7 @@ | |
113 | PrivacyManager(); | |
114 | if( "${PRIVACYMGRSTATUS}" = "FAILED" ) | |
115 | { | |
116 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm); | |
117 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm); | |
118 | &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket); | |
119 | Hangup(); | |
120 | return; | |
121 | @@ -2138,7 +2138,7 @@ | |
122 | verbose(direct is XXX#${direct}XXXX); | |
123 | Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to... | |
124 | Playback(/var/spool/asterisk/voicemail/default/${direct}/greet); | |
125 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
126 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
127 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&); | |
128 | switch(${direct}) | |
129 | { | |
130 | @@ -2223,7 +2223,7 @@ | |
131 | ||
132 | } | |
133 | 1 => { // Sonya | |
134 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
135 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
136 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&); | |
137 | &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket); | |
138 | goto s|loopback; | |
139 | @@ -2421,51 +2421,51 @@ | |
140 | Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal | |
141 | } | |
142 | 1 => { // SEAN | |
143 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
144 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
145 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&); | |
146 | // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket); | |
147 | &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket); | |
148 | goto homeline|s|loopback; | |
149 | } | |
150 | 2 => { // ERIC | |
151 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
152 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
153 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&); | |
154 | Voicemail(u4); | |
155 | goto homeline|s|loopback; | |
156 | ||
157 | // SetMusicOnHold(erics); | |
158 | - // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
159 | + // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
160 | // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&); | |
161 | // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket); | |
162 | // goto homeline|s|loopback; | |
163 | } | |
164 | 3 => { // RYAN | |
165 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
166 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
167 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&); | |
168 | &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket); | |
169 | goto homeline|s|loopback; | |
170 | } | |
171 | 4 => { // KYLE | |
172 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
173 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
174 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&); | |
175 | &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket); | |
176 | goto homeline|s|loopback; | |
177 | } | |
178 | 5 => { | |
179 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
180 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
181 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&); | |
182 | &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket); | |
183 | goto homeline|s|loopback; | |
184 | ||
185 | } | |
186 | 6 => { | |
187 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
188 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
189 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&); | |
190 | &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket); | |
191 | goto homeline|s|loopback; | |
192 | } | |
193 | 7 => { | |
194 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
195 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
196 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&); | |
197 | &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket); | |
198 | goto homeline|s|loopback; | |
199 | @@ -2517,7 +2517,7 @@ | |
200 | // Otherwise, dial 1, and hopefully, you will reach Steve. | |
201 | } | |
202 | 1 => { | |
203 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
204 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
205 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&); | |
206 | ||
207 | &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket); | |
208 | @@ -2778,7 +2778,7 @@ | |
209 | } | |
210 | 761 => { | |
211 | Record(announcement:gsm); | |
212 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&); | |
213 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&); | |
214 | goto s|loopback; | |
215 | } | |
216 | 762 => { | |
217 | Index: pbx/ael/ael-test/ael-vtest13/extensions.ael | |
218 | =================================================================== | |
219 | --- pbx/ael/ael-test/ael-vtest13/extensions.ael (revision 222649) | |
220 | +++ pbx/ael/ael-test/ael-vtest13/extensions.ael (working copy) | |
221 | @@ -2048,7 +2048,7 @@ | |
222 | ||
223 | macro callerid-liar() | |
224 | { | |
225 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&); | |
226 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&); | |
227 | Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their | |
228 | // faces to get in the front door, and unidentified callers won't fair | |
229 | // any better. You entered *MY* phone number. That won't work. | |
230 | @@ -2105,7 +2105,7 @@ | |
231 | PrivacyManager(); | |
232 | if( "${PRIVACYMGRSTATUS}" = "FAILED" ) | |
233 | { | |
234 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm); | |
235 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm); | |
236 | &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket); | |
237 | Hangup(); | |
238 | return; | |
239 | @@ -2137,7 +2137,7 @@ | |
240 | verbose(direct is XXX#${direct}XXXX); | |
241 | Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to... | |
242 | Playback(/var/spool/asterisk/voicemail/default/${direct}/greet); | |
243 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
244 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
245 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&); | |
246 | switch(${direct}) | |
247 | { | |
248 | @@ -2222,7 +2222,7 @@ | |
249 | ||
250 | } | |
251 | 1 => { // Sonya | |
252 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
253 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
254 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&); | |
255 | &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket); | |
256 | goto s|loopback; | |
257 | @@ -2420,51 +2420,51 @@ | |
258 | Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal | |
259 | } | |
260 | 1 => { // SEAN | |
261 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
262 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
263 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&); | |
264 | // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket); | |
265 | &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket); | |
266 | goto homeline|s|loopback; | |
267 | } | |
268 | 2 => { // ERIC | |
269 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
270 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
271 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&); | |
272 | Voicemail(u4); | |
273 | goto homeline|s|loopback; | |
274 | ||
275 | // SetMusicOnHold(erics); | |
276 | - // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
277 | + // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
278 | // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&); | |
279 | // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket); | |
280 | // goto homeline|s|loopback; | |
281 | } | |
282 | 3 => { // RYAN | |
283 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
284 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
285 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&); | |
286 | &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket); | |
287 | goto homeline|s|loopback; | |
288 | } | |
289 | 4 => { // KYLE | |
290 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
291 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
292 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&); | |
293 | &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket); | |
294 | goto homeline|s|loopback; | |
295 | } | |
296 | 5 => { | |
297 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
298 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
299 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&); | |
300 | &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket); | |
301 | goto homeline|s|loopback; | |
302 | ||
303 | } | |
304 | 6 => { | |
305 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
306 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
307 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&); | |
308 | &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket); | |
309 | goto homeline|s|loopback; | |
310 | } | |
311 | 7 => { | |
312 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
313 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
314 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&); | |
315 | &std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket); | |
316 | goto homeline|s|loopback; | |
317 | @@ -2516,7 +2516,7 @@ | |
318 | // Otherwise, dial 1, and hopefully, you will reach Steve. | |
319 | } | |
320 | 1 => { | |
321 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); | |
322 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); | |
323 | TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&); | |
324 | ||
325 | &std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket); | |
326 | @@ -2777,7 +2777,7 @@ | |
327 | } | |
328 | 761 => { | |
329 | Record(announcement:gsm); | |
330 | - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&); | |
331 | + TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&); | |
332 | goto s|loopback; | |
333 | } | |
334 | 762 => { | |
335 | Index: agi/jukebox.agi | |
336 | =================================================================== | |
337 | --- agi/jukebox.agi (revision 222649) | |
338 | +++ agi/jukebox.agi (working copy) | |
339 | @@ -17,7 +17,7 @@ | |
340 | # | |
341 | # Uses festival to list off all your MP3 music files over a channel in | |
342 | # a hierarchical fashion. Put this file in your agi-bin folder which | |
343 | -# is located at: /var/lib/asterisk/agi-bin Be sure to chmod +x it! | |
344 | +# is located at: /usr/share/asterisk/agi-bin Be sure to chmod +x it! | |
345 | # | |
346 | # Invocation Example: | |
347 | # exten => 68742,1,Answer() | |
348 | Index: agi/DialAnMp3.agi | |
349 | =================================================================== | |
350 | --- agi/DialAnMp3.agi (revision 222649) | |
351 | +++ agi/DialAnMp3.agi (working copy) | |
352 | @@ -17,7 +17,7 @@ | |
353 | print STDERR " -- $i = $AGI{$i}\n"; | |
354 | } | |
355 | ||
356 | -dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");; | |
357 | +dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");; | |
358 | ||
359 | sub checkresult { | |
360 | my ($res) = @_; | |
361 | Index: agi/numeralize | |
362 | =================================================================== | |
363 | --- agi/numeralize (revision 222649) | |
364 | +++ agi/numeralize (working copy) | |
365 | @@ -6,7 +6,7 @@ | |
366 | ||
367 | $mp3dir="/usr/media/mpeg3"; | |
368 | ||
369 | -dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");; | |
370 | +dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");; | |
371 | sub process_dir { | |
372 | my ($dir) = @_; | |
373 | my $file; | |
374 | Index: apps/app_rpt.c | |
375 | =================================================================== | |
376 | --- apps/app_rpt.c (revision 222649) | |
377 | +++ apps/app_rpt.c (working copy) | |
378 | @@ -241,7 +241,7 @@ | |
379 | #define TONEMACRO "tonemacro" | |
380 | #define FUNCCHAR '*' | |
381 | #define ENDCHAR '#' | |
382 | -#define EXTNODEFILE "/var/lib/asterisk/rpt_extnodes" | |
383 | +#define EXTNODEFILE "/usr/share/asterisk/rpt_extnodes" | |
384 | #define NODENAMES "rpt/nodenames" | |
385 | #define PARROTFILE "/tmp/parrot_%s_%u" | |
386 | ||
6889aefb ER |
387 | Index: configs/iax.conf.sample |
388 | =================================================================== | |
389 | --- configs/iax.conf.sample (revision 222649) | |
390 | +++ configs/iax.conf.sample (working copy) | |
391 | @@ -412,8 +412,8 @@ | |
392 | ; authentication is used, "inkeys" is a list of acceptable public keys on the | |
393 | ; local system that can be used to authenticate the remote peer, separated by | |
394 | ; the ":" character. "outkey" is a single, private key to use to authenticate | |
395 | -; to the other side. Public keys are named /var/lib/asterisk/keys/<name>.pub | |
396 | -; while private keys are named /var/lib/asterisk/keys/<name>.key. Private | |
397 | +; to the other side. Public keys are named /usr/share/asterisk/keys/<name>.pub | |
398 | +; while private keys are named /usr/share/asterisk/keys/<name>.key. Private | |
399 | ; keys should always be 3DES encrypted. | |
400 | ; | |
401 | ; | |
402 | Index: configs/festival.conf.sample | |
403 | =================================================================== | |
404 | --- configs/festival.conf.sample (revision 222649) | |
405 | +++ configs/festival.conf.sample (working copy) | |
406 | @@ -21,7 +21,7 @@ | |
407 | ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process. | |
408 | ; Defaults to /tmp/ | |
409 | ; | |
410 | -;cachedir=/var/lib/asterisk/festivalcache/ | |
411 | +;cachedir=/var/spool/asterisk/festival/ | |
412 | ; | |
413 | ; Festival command to send to the server. | |
414 | ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n | |
415 | Index: configs/http.conf.sample | |
416 | =================================================================== | |
417 | --- configs/http.conf.sample (revision 222649) | |
418 | +++ configs/http.conf.sample (working copy) | |
419 | @@ -5,7 +5,7 @@ | |
420 | ; Note about Asterisk documentation: | |
421 | ; If Asterisk was installed from a tarball, then the HTML documentation should | |
422 | ; be installed in the static-http/docs directory which is | |
423 | -; (/var/lib/asterisk/static-http/docs) on linux by default. If the Asterisk | |
424 | +; (/usr/share/asterisk/static-http/docs) on linux by default. If the Asterisk | |
425 | ; HTTP server is enabled in this file by setting the "enabled", "bindaddr", | |
426 | ; and "bindport" options, then you should be able to view the documentation | |
427 | ; remotely by browsing to: | |
428 | @@ -66,6 +66,6 @@ | |
429 | ;[post_mappings] | |
430 | ; | |
431 | ; In this example, if the prefix option is set to "asterisk", then using the | |
432 | -; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/. | |
433 | -;uploads = /var/lib/asterisk/uploads/ | |
434 | +; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/. | |
435 | +;uploads = /var/spool/asterisk/uploads/ | |
436 | ; | |
437 | Index: configs/phoneprov.conf.sample | |
438 | =================================================================== | |
439 | --- configs/phoneprov.conf.sample (revision 222649) | |
440 | +++ configs/phoneprov.conf.sample (working copy) | |
430af958 AM |
441 | @@ -114,4 +114,4 @@ |
442 | ${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov) | |
443 | config/${MAC} => polycom.xml ; Dynamic Filename => template file | |
444 | ${MAC}-directory.xml => 000000000000-directory.xml | |
6889aefb ER |
445 | -setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable |
446 | +setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable | |
447 | Index: configs/musiconhold.conf.sample | |
448 | =================================================================== | |
b16f228f CM |
449 | --- configs/musiconhold.conf.sample.orig 2010-10-16 13:47:00.000000000 +0300 |
450 | +++ configs/musiconhold.conf.sample 2010-10-23 13:01:47.124150334 +0300 | |
430af958 AM |
451 | @@ -32,7 +32,7 @@ |
452 | ; The path specified can be either an absolute path (starts with '/'), | |
453 | ; or a relative path; relative paths are interpreted as being relative | |
b16f228f | 454 | ; to the 'astdatalibdir' in asterisk.conf, which defaults to |
430af958 AM |
455 | -; /var/lib/asterisk. |
456 | +; /usr/share/asterisk. | |
6889aefb | 457 | ; |
430af958 AM |
458 | ; NOTE: |
459 | ; If you are not using "autoload" in modules.conf, then you | |
460 | @@ -68,7 +68,7 @@ | |
6889aefb ER |
461 | ;mode=custom |
462 | ; Note that with mode=custom, a directory is not required, such as when reading | |
463 | ; from a stream. | |
464 | -;directory=/var/lib/asterisk/mohmp3 | |
465 | +;directory=/usr/share/asterisk/mohmp3 | |
466 | ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s | |
467 | ||
468 | ;[ulawstream] | |
430af958 | 469 | @@ -80,5 +80,5 @@ |
6889aefb ER |
470 | ; choice |
471 | ;[solaris] | |
472 | ;mode=custom | |
473 | -;directory=/var/lib/asterisk/mohmp3 | |
474 | +;directory=/usr/share/asterisk/mohmp3 | |
475 | ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12 | |
476 | Index: configs/osp.conf.sample | |
477 | =================================================================== | |
b16f228f CM |
478 | --- configs/osp.conf.sample.orig 2010-07-12 07:16:18.000000000 +0300 |
479 | +++ configs/osp.conf.sample 2010-10-23 13:00:01.017483668 +0300 | |
480 | @@ -45,8 +45,8 @@ | |
6889aefb ER |
481 | ;source=domain name or [IP address in brackets] |
482 | ; | |
483 | ; Define path and file name of crypto files. | |
b16f228f | 484 | -; The default path for crypto file is /var/lib/asterisk/keys. If no path is |
6889aefb | 485 | -; defined, crypto files will in /var/lib/asterisk/keys directory. |
b16f228f CM |
486 | +; The default path for crypto file is /user/share/asterisk/keys. If no path is |
487 | +; defined, crypto files will in /user/share/asterisk/keys directory. | |
6889aefb | 488 | ; |
b16f228f CM |
489 | ; Specify the private key file name. |
490 | ; If this parameter is unspecified or not present, the default name will be the | |
430af958 | 491 | Index: configs/res_config_sqlite.conf.sample |
6889aefb | 492 | =================================================================== |
430af958 AM |
493 | --- configs/res_config_sqlite.conf.sample (revision 222649) |
494 | +++ configs/res_config_sqlite.conf.sample (working copy) | |
6889aefb ER |
495 | @@ -1,7 +1,7 @@ |
496 | [general] | |
497 | ||
498 | ; The database file. | |
499 | -dbfile => /var/lib/asterisk/sqlite.db | |
500 | +dbfile => /var/spool/asterisk/sqlite.db | |
501 | ||
502 | ; Both config_table and cdr_table are optional. If config_table is omitted, | |
503 | ; you must specify it in extconfig.conf. If it is both provided here and in | |
504 | Index: utils/ael_main.c | |
505 | =================================================================== | |
506 | --- utils/ael_main.c (revision 222649) | |
507 | +++ utils/ael_main.c (working copy) | |
508 | @@ -496,7 +496,7 @@ | |
509 | strcpy(config_dir, "/etc/asterisk"); | |
510 | localized_use_conf_dir(); | |
511 | } | |
512 | - strcpy(var_dir, "/var/lib/asterisk"); | |
513 | + strcpy(var_dir, "/usr/share/asterisk"); | |
514 | ||
515 | if( dump_extensions ) { | |
516 | dumpfile = fopen("extensions.conf.aeldump","w"); | |
517 | Index: contrib/scripts/astgenkey.8 | |
518 | =================================================================== | |
519 | --- contrib/scripts/astgenkey.8 (revision 222649) | |
520 | +++ contrib/scripts/astgenkey.8 (working copy) | |
521 | @@ -88,7 +88,7 @@ | |
522 | .RE | |
523 | ||
524 | Those files should be copied to | |
525 | -.I /var/lib/asterisk/keys | |
526 | +.I /usr/share/asterisk/keys | |
527 | ||
528 | (The private key: on your system. The public key: on other systems) | |
529 | ||
530 | @@ -122,10 +122,10 @@ | |
531 | And then make the key accessible to Asterisk (assuming you run it as | |
532 | user "asterisk"). | |
533 | ||
534 | - chown asterisk /var/lib/asterisk/keys/yourname.* | |
535 | + chown asterisk /usr/share/asterisk/keys/yourname.* | |
536 | ||
537 | .SH FILES | |
538 | -.I /var/lib/asterisk/keys | |
539 | +.I /usr/share/asterisk/keys | |
540 | .RS | |
541 | .RE | |
542 | ||
543 | Index: contrib/scripts/astgenkey | |
544 | =================================================================== | |
545 | --- contrib/scripts/astgenkey (revision 222649) | |
546 | +++ contrib/scripts/astgenkey (working copy) | |
547 | @@ -29,7 +29,7 @@ | |
548 | echo "in PEM format for use by Asterisk. You will be asked to" | |
549 | echo "enter a passcode for your key multiple times. Please" | |
550 | echo "enter the same code each time. The resulting files will" | |
551 | - echo "need to be moved to /var/lib/asterisk/keys if you want" | |
552 | + echo "need to be moved to /usr/share/asterisk/keys if you want" | |
553 | echo "to use them, and any private keys (.key files) will" | |
554 | echo "need to be initialized at runtime either by running" | |
555 | echo "Asterisk with the '-i' option, or with the 'init keys'" | |
556 | Index: contrib/utils/README.rawplayer | |
557 | =================================================================== | |
558 | --- contrib/utils/README.rawplayer (revision 222649) | |
559 | +++ contrib/utils/README.rawplayer (working copy) | |
560 | @@ -16,11 +16,11 @@ | |
561 | sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw | |
562 | ||
563 | ||
564 | -Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw). | |
565 | +Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw). | |
566 | and set up a class in musiconhold.conf like so: | |
567 | ||
568 | [classes] | |
569 | -default => custom:/var/lib/asterisk/holdmusic_raw,/usr/bin/rawplayer | |
570 | +default => custom:/usr/share/asterisk/holdmusic_raw,/usr/bin/rawplayer | |
571 | ||
572 | ||
573 | This is the most efficient way to implement moh because no cpu usage is required to | |
574 | Index: UPGRADE-1.4.txt | |
575 | =================================================================== | |
576 | --- UPGRADE-1.4.txt (revision 222649) | |
577 | +++ UPGRADE-1.4.txt (working copy) | |
578 | @@ -92,7 +92,7 @@ | |
579 | WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages; | |
580 | instead of the alternate-language files being stored in subdirectories underneath | |
581 | the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr, | |
582 | -etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the | |
583 | +etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the | |
584 | language itself, then places all the sound files for that language under that | |
585 | directory and its subdirectories. This is the layout that will be created if you | |
586 | select non-English languages to be installed via menuselect, HOWEVER Asterisk does |