Sync CMake config-file templates with original ones

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1935 8eb893ce-cfd4-0310-b710-fb5ebe64c474

apps/annrecorder/etc/annrecorder.conf.cmake

@@ -23,3 +23,13 @@ greeting_set=${SEMS_AUDIO_PREFIX}/sems/audio/annrecorder/greeting_set.wav
 # "Thank you for using the iptel dot org service. Good Bye. - "
 bye=${SEMS_AUDIO_PREFIX}/sems/audio/annrecorder/bye.wav
 
+#
+# Simple mode: 
+#
+#  If the simple mode is activated, the user part 
+#  of the From-URI is used as the key to store the 
+#  user annoucement. (no domain is used)
+#
+# Default value: no
+#
+# simple_mode=yes

apps/mailbox/etc/mailbox.conf.cmake

@@ -0,0 +1,5 @@
+#CFGOPTION_SEMS_MAILBOX_ANNOUNCEFILE
+annoucement_file=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/default_en.wav
+#ENDCFGOPTION
+
+beep_file=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/beep.wav

apps/mailbox/etc/mailbox_query.conf.cmake

@@ -0,0 +1,5 @@
+#CFGOPTION_SEMS_MAILBOX_QUERY_WAV_DIR
+wav_dir=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/
+#ENDCFGOPTION
+
+beep_file=${SEMS_AUDIO_PREFIX}/sems/audio/mailbox/beep.wav

apps/voicebox/etc/voicebox.conf.cmake

@@ -15,7 +15,7 @@ prompt_base_path=${SEMS_AUDIO_PREFIX}/sems/audio/voicebox/
 # 
 # specific prompts for these domains will be supported:
 #
-domains=iptel.org
+# domains=iptel.org;otherdomain.org
 
 # 
 # a language may have single digits to follow the tens if spoken 
@@ -32,6 +32,20 @@ languages=english(digits=right);
 #
 default_language=english
 
+#
+# Simple mode: 
+#
+#  If the simple mode is activated, the user part   
+#  of the From-URI is used as the key to retrieve the voicemails. 
+#
+#  Also, the user will not be asked for a PIN. It is the responsability
+#  of upstream SIP proxies to ensure any requried protection of the 
+#  personnal voiceboxes.
+#
+# Default value: no
+#
+#simple_mode=yes
+
 #
 # keys config (optional)
 #

apps/voicemail/etc/voicemail.conf.cmake

@@ -1,41 +1,42 @@
 #
-# optional parameter: smtp_server=<hostname>
+# Voicemail plug-in configuration file
 #
-# - sets address of smtp server
 #
-# Default: localhost
-#smtp_server=mail
 
-# optional parameter: smtp_port=<port>
 #
-# - sets port of smtp server
+# Generic settings: applicable in any operation mode
 #
-# Default: 25
-#smtp_port=25
 
-# if set, this overrides the email address, meaning that
-# the voicemail will always be sent to that address.
-# email_address = blub@mail.domain.net
 #
-
-# These are needed if you keep audio and template files in file system:
+# Default Voicemail mode:
+#  This sets the main operation mode of this plug-in.
 #
-# path from which announcements are played:
-announce_path=${SEMS_AUDIO_PREFIX}/sems/audio/voicemail/
+# - 0: voicemail classic (only send an email)
+# - 1: voicebox (message stored through the msg_storage plug-in; query with the voicebox app)
+# - 2: both (send an email AND store with msg_storage)
+# - 3: announcement (play the annoucement but do not record anything)
 #
-# announcement played if no user/domain specific prompt found
-default_announce=default_en.wav
+# Default value: 0
 #
-# path for email templates:
-email_template_path=${SEMS_CFG_PREFIX}/etc/sems/
+default_vm_mode=0
 
-# These are needed if you keep audio and template files in MySQL database:
-#mysql_host=localhost
-#mysql_user=sems
-#mysql_passwd=sems
-#mysql_db=sems
-
-# These are independent on where audio and template files are kept:
+#
+# Simple mode:
+#
+#  If the simple mode is activated, the user part of the 
+#  request URI is used as the key to store the voicemails. 
+#
+#  When the simple mode is de-activated (default), several parameters
+#  have to be passed to SEMS either through the 'P-App-Param' header field
+#  (together with the 'P-App-Name' header field), or through R-URI parameters.
+#
+#  Please note that the simple mode requires a default email address if
+#  either the 'voicemail' or 'both' operation mode has been chosen
+#  (see 'email_address' configuration parameter).
+#
+# Default value: no
+#
+#simple_mode=yes
 
 #
 # maximum voicemail message length, in seconds.
@@ -67,6 +68,52 @@ max_record_time=30
 # Default:
 #  try_personal_greeting=no
 
+
+#
+# These settings are needed if you keep audio and template files in MySQL database:
+# (voicemail must have been compiled with MySQL support)
+#
+#mysql_host=localhost
+#mysql_user=sems
+#mysql_passwd=sems
+#mysql_db=sems
+
+# These settings are needed if you keep audio and template files in file system:
+#
+# path from which announcements are played:
+announce_path=${SEMS_AUDIO_PREFIX}/sems/audio/voicemail/
+#
+# announcement played if no user/domain specific prompt found
+default_announce=default_en.wav
+
+#
+# Options specific to the voicemail mode (and 'both')
+#
+
+# if set, this overrides any other email address, meaning that
+# the voicemail will always be sent to that address.
+#
+# email_address = blub@mail.domain.net
+
+#
+# optional parameter: smtp_server=<hostname>
+#
+# - sets address of smtp server
+#
+# Default: localhost
+#smtp_server=mail
+
+# optional parameter: smtp_port=<port>
+#
+# - sets port of smtp server
+#
+# Default: 25
+#smtp_port=25
+
+#
+# path for email templates:
+email_template_path=${SEMS_CFG_PREFIX}/etc/sems/
+
 # mail_header_vars=var1;var2;var3;...
 #
 # Variables that are substituted in the email template with 
@@ -81,3 +128,8 @@ max_record_time=30
 #                   %sender_count% from this sender.
 #
 # Default: none
+
+
+#
+# These options are applicable to all configurations:
+#