[Asterisk-cvs] asterisk/configs enum.conf.sample, 1.3, 1.4 extensions.conf.sample, 1.37, 1.38 iax.conf.sample, 1.42, 1.43 logger.conf.sample, 1.10, 1.11 manager.conf.sample, 1.4, 1.5 meetme.conf.sample, 1.3, 1.4 sip.conf.sample, 1.59, 1.60 zapata.conf.sample, 1.40, 1.41

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/configs
In directory mongoose.digium.com:/tmp/cvs-serv31857/configs

Modified Files:
	enum.conf.sample extensions.conf.sample iax.conf.sample 
	logger.conf.sample manager.conf.sample meetme.conf.sample 
	sip.conf.sample zapata.conf.sample 
Log Message:
Merge config sample updates mentioning reload (bug #3697)


Index: enum.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/enum.conf.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- enum.conf.sample	19 May 2004 03:28:36 -0000	1.3
+++ enum.conf.sample	17 Mar 2005 15:56:55 -0000	1.4
@@ -2,6 +2,7 @@
 ; ENUM Configuration for resolving phone numbers over DNS
 ;
 ; Sample config for Asterisk
+; This file is reloaded at "reload enum" in the CLI
 ;
 [general]
 ;

Index: extensions.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/extensions.conf.sample,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- extensions.conf.sample	1 Feb 2005 01:53:24 -0000	1.37
+++ extensions.conf.sample	17 Mar 2005 15:56:55 -0000	1.38
@@ -3,6 +3,9 @@
 ; the pbx_config module. This is where you configure all your 
 ; inbound and outbound calls in Asterisk. 
 ; 
+; This configuration file is reloaded 
+; - With the "extensions reload" command in the CLI
+; - With the "reload" command (that reloads everything) in the CLI
 
 ;
 ; The "General" category is for certain variables.  

Index: iax.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/iax.conf.sample,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- iax.conf.sample	16 Feb 2005 02:58:18 -0000	1.42
+++ iax.conf.sample	17 Mar 2005 15:56:55 -0000	1.43
@@ -1,6 +1,9 @@
 
 ; Inter-Asterisk eXchange driver definition
 ;
+; This configuration is re-read at reload
+; or with the CLI command
+; 	reload chan_iax2.so
 ;
 ; General settings, like port number to bind to, and
 ; an option address (the default is to bind to all

Index: logger.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/logger.conf.sample,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- logger.conf.sample	11 Mar 2005 08:49:01 -0000	1.10
+++ logger.conf.sample	17 Mar 2005 15:56:55 -0000	1.11
@@ -3,6 +3,9 @@
 ;
 ; In this file, you configure logging to files or to
 ; the syslog system.
+;
+; "logger reload" at the CLI will reload configuration
+; of the logging system.
 
 [general]
 ; Customize the display of debug message time stamps

Index: manager.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/manager.conf.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- manager.conf.sample	5 Jan 2005 06:24:59 -0000	1.4
+++ manager.conf.sample	17 Mar 2005 15:56:55 -0000	1.5
@@ -1,5 +1,23 @@
 ;
-; Asterisk Call Management support
+; AMI - The Asterisk Manager Interface
+; 
+; Third party application call management support
+; and PBX event supervision
+;
+; This configuration file is read every time someone
+; logs in
+;
+; Use the "show manager commands" at the CLI to list
+; availabale manager commands and their authorization
+; levels.
+;
+; "show manager command <command>" will show a help text.
+;
+; ------------------- SECURITY NOTE -----------------
+; Note that you should not enable the AMI on a public
+; IP address. If needed, block this TCP port with
+; iptables (or another FW software) and reach it
+; with IPsec, SSH or SSL vpn tunnel
 ;
 [general]
 enabled = no
@@ -11,5 +29,7 @@
 ;secret = mysecret
 ;deny=0.0.0.0/0.0.0.0
 ;permit=209.16.236.73/255.255.255.0
+;
+; Authorization for various classes 
 ;read = system,call,log,verbose,command,agent,user
 ;write = system,call,log,verbose,command,agent,user

Index: meetme.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/meetme.conf.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- meetme.conf.sample	22 Feb 2005 15:42:41 -0000	1.3
+++ meetme.conf.sample	17 Mar 2005 15:56:55 -0000	1.4
@@ -2,6 +2,8 @@
 ; Configuration file for MeetMe simple conference rooms
 ; for Asterisk of course.
 ;
+; This configuration file is read every time you call app meetme()
+;
 [rooms]
 ;
 ; Usage is conf => confno[,pin][,adminpin]	

Index: sip.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/sip.conf.sample,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- sip.conf.sample	13 Feb 2005 16:40:56 -0000	1.59
+++ sip.conf.sample	17 Mar 2005 15:56:55 -0000	1.60
@@ -19,6 +19,9 @@
 ;
 ;   sip debug			Show all SIP messages
 ;
+;   reload chan_sip.so		Reload configuration file
+;				Active SIP peers will not be reconfigured
+;
 
 [general]
 context=default			; Default context for incoming calls

Index: zapata.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/zapata.conf.sample,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- zapata.conf.sample	8 Feb 2005 07:49:40 -0000	1.40
+++ zapata.conf.sample	17 Mar 2005 15:56:55 -0000	1.41
@@ -2,6 +2,14 @@
 ; Zapata telephony interface
 ;
 ; Configuration file
+;
+; You need to restart Asterisk to re-configure the Zap channel
+; CLI> reload chan_zap.so 
+;		will reload the configuration file,
+;		but not all configuration options are 
+; 		re-configured during a reload.
+
+
 
 [trunkgroups]
 ;