Update res_phoneprov to default to setting the SERVER variable to the IP

the HTTP request for the config came in on and the SERVER_PORT to the
bindport setting in sip.conf.  I've left in the ability to override these
options, because I can't always guess how someone might decide to do something
weird with what is available to them--although needing to is pretty unlikely.

Documentation was updated to reflect preference for not setting serveraddr,
serveriface, or serverport.  Tested on Linux and OS X.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98988 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 15 insertions, 9 deletions

diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
index d813a7f45..cb236a89a 100644
--- a/doc/tex/phoneprov.tex
+++ b/doc/tex/phoneprov.tex
@@ -21,20 +21,26 @@ Below is a sample of the general section of \path{phoneprov.conf}:
 \begin{verbatim}
 [general]
 ;serveriface=eth0
-serveraddr=192.168.1.1
-serverport=5060
+;serveraddr=192.168.1.1
+;serverport=5060
 default_profile=polycom
 \end{verbatim}
 \end{astlisting}
 
-There are two choices for setting the SERVER variable. If the IP address of the server is 
-known, or the hostname resolvable by the phones, the appropriate \textbf{serveraddr} 
-value should be set.  Alternatively, the network interface that the server listens on can 
-be set by specifying a \textbf{serveriface} and SERVER will be set to the IP address of 
-that interface.  Only one of these options should be set.
+By default, res\_phoneprov will set the SERVER variable to the IP address on the server
+that the requesting phone uses to contact the asterisk HTTP server.  The SERVER\_PORT
+variable will default to the \textbf{bindport} setting in sip.conf.
 
-The SERVER\_PORT variable is set by setting the \textbf{serverport}.  If serverport is 
-not specified, it is set to a default value of 5060.
+Should the defaults be insufficient, there are two choices for overriding the default 
+setting of the SERVER variable. If the IP address of the server is known, or the hostname 
+resolvable by the phones, the appropriate \textbf{serveraddr} value should be set.  
+Alternatively, the network interface that the server listens on can be set by specifying a
+\textbf{serveriface} and SERVER will be set to the IP address of that interface.  Only one
+of these options should be set.
+
+The default SERVER\_PORT variable can be overridden by setting the \textbf{serverport}.
+If \textbf{bindport} is not set in \path{sip.conf} and serverport is not specified, it 
+is set to a default value of 5060.
 
 Any user set for auto-provisioning in users.conf without a specified profile will be 
 assumed to belong to the profile set with \textbf{default\_profile}.