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