packages: asterisk/FHS-paths.patch - 1.8.1.1
areq
areq at pld-linux.org
Fri Dec 17 21:53:10 CET 2010
Author: areq Date: Fri Dec 17 20:53:10 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.8.1.1
---- Files affected:
packages/asterisk:
FHS-paths.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/asterisk/FHS-paths.patch
diff -u packages/asterisk/FHS-paths.patch:1.3 packages/asterisk/FHS-paths.patch:1.4
--- packages/asterisk/FHS-paths.patch:1.3 Sat Oct 23 12:03:48 2010
+++ packages/asterisk/FHS-paths.patch Fri Dec 17 21:53:05 2010
@@ -383,114 +383,6 @@
#define NODENAMES "rpt/nodenames"
#define PARROTFILE "/tmp/parrot_%s_%u"
-Index: doc/osp.txt
-===================================================================
---- doc/osp.txt (revision 222649)
-+++ doc/osp.txt (working copy)
-@@ -136,7 +136,7 @@
- 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).
-
- 2.2 Obtain Crypto Files
--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.
-+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.
-
- 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..
-
-@@ -183,7 +183,7 @@
- verify return:1
- The certificate request was successful.
- Error Code returned from localcert command : 0
--The files generated should be copied to the /var/lib/asterisk/keys directory.
-+The files generated should be copied to the /usr/share/asterisk/keys directory.
- 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.
-
- 3 Asterisk
-@@ -247,9 +247,9 @@
- source=[host IP]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys. If no
-+; The default path for crypto file is /usr/share/asterisk/keys. If no
- ; path is defined, crypto files should be in
--; /var/lib/asterisk/keys directory.
-+; /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.
- ; If this parameter is unspecified or not present, the default name
-Index: doc/tex/phoneprov.tex
-===================================================================
---- doc/tex/phoneprov.tex (revision 222649)
-+++ doc/tex/phoneprov.tex (working copy)
-@@ -58,7 +58,7 @@
- [polycom]
- staticdir => configs/
- mime_type => text/xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
- static_file => bootrom.ld,application/octet-stream
- static_file => bootrom.ver,plain/text
- static_file => sip.ld,application/octet-stream
-Index: doc/tex/ael.tex
-===================================================================
---- doc/tex/ael.tex (revision 222649)
-+++ doc/tex/ael.tex (working copy)
-@@ -1167,7 +1167,7 @@
- the application that would set that variable is not called in
- the same extension. This is a warning only...
- \item Calls to applications not in the "applist" database (installed
-- in \path{/var/lib/asterisk/applist}" on most systems).
-+ in \path{/usr/share/asterisk/applist}" on most systems).
- \item In an assignment statement, if the assignment is to a function,
- the function name used is checked to see if it one of the
- currently known functions. A warning is issued if it is not.
-Index: doc/tex/asterisk-conf.tex
-===================================================================
---- doc/tex/asterisk-conf.tex (revision 222649)
-+++ doc/tex/asterisk-conf.tex (working copy)
-@@ -18,10 +18,10 @@
- astmoddir => /usr/lib/asterisk/modules
-
- ; Where additional 'library' elements (scripts, etc.) are located
--astvarlibdir => /var/lib/asterisk
-+astvarlibdir => /usr/share/asterisk
-
- ; Where AGI scripts/programs are located
--astagidir => /var/lib/asterisk/agi-bin
-+astagidir => /usr/share/asterisk/agi-bin
-
- ; Where spool directories are located
- ; Voicemail, monitor, dictation and other apps will create files here
-Index: doc/tex/privacy.tex
-===================================================================
---- doc/tex/privacy.tex (revision 222649)
-+++ doc/tex/privacy.tex (working copy)
-@@ -210,7 +210,7 @@
-
- When there is no CallerID, P and p options will always record an intro
- for the incoming caller. This intro will be stored temporarily in the
--\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
-+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
- NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
- callee decides what to do with the call.
-
-@@ -245,7 +245,7 @@
- \subsubsection{Introductions}
- Unless instructed to not save introductions (see the 'n' option above),
- the screening modes will save the recordings of the caller's names in
--the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
-+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
- a CallerID. Just the 10-digit callerid numbers are used as filenames,
- with a ".gsm" at the end.
-
-@@ -260,7 +260,7 @@
-
- \begin{astlisting}
- \begin{verbatim}
--exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
-+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
- exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
- \end{verbatim}
- \end{astlisting}
Index: configs/iax.conf.sample
===================================================================
--- configs/iax.conf.sample (revision 222649)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/FHS-paths.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list