[asterisk-commits] qwell: trunk r86408 - in /trunk: ./ Makefile

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Oct 18 17:03:03 2007
New Revision: 86408

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86408
Log:
Merged revisions 86405 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #11029)
........
r86405 | qwell | 2007-10-18 16:58:44 -0500 (Thu, 18 Oct 2007) | 4 lines

Add documentation for options in asterisk.conf

Issue 11029, patch by eserra

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=86408&r1=86407&r2=86408
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Oct 18 17:03:03 2007
@@ -577,6 +577,17 @@
 		echo ";internal_timing = yes" ; \
 		echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
 		echo ";autosystemname = yes ; automatically set systemname to hostname - uses 'localhost' on failure, or systemname if set" ; \
+		echo ";maxcalls = 10 ; Maximum amount of calls allowed" ; \
+		echo ";maxload = 0.9 ; Asterisk stops accepting new calls if the load average exceed this limit" ; \
+		echo ";maxfiles = 1000 ; Maximum amount of openfiles" ; \
+		echo ";minmemfree = 1 ; in MBs, Asterisk stops accepting new calls if the amount of free memory falls below this watermark" ; \
+		echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
+		echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \
+		echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
+		echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
+		echo ";runuser = asterisk ; The user to run as" ; \
+		echo ";rungroup = asterisk ; The group to run as" ; \
+		echo "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
 		echo ";astctlpermissions = 0660" ; \