diff options
author | Terry Wilson <twilson@digium.com> | 2008-01-17 03:09:32 +0000 |
---|---|---|
committer | Terry Wilson <twilson@digium.com> | 2008-01-17 03:09:32 +0000 |
commit | 417c6dcb1d232d81eeb8de8ebd72fe1bc308279a (patch) | |
tree | 55623b608d2b6e9cb6af4c51688990b22056c79e /doc/tex | |
parent | ac3c95e370ab1aa12a3ff607f9dd5a273d25279d (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@98988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'doc/tex')
-rw-r--r-- | doc/tex/phoneprov.tex | 24 |
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}. |