summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-pbx/root
diff options
context:
space:
mode:
authorIordan Iordanov <iiordanov@gmail.com>2011-11-26 02:29:26 +0000
committerIordan Iordanov <iiordanov@gmail.com>2011-11-26 02:29:26 +0000
commit60e46ff416448164fc8c65940b908d61c9e6e85d (patch)
treef17ebc098eeadf661f000fdd07b8a4c626ed272e /applications/luci-pbx/root
parentc0a776877858ee5354b7acd73d84dccfda0a9513 (diff)
1) Fixed wording in a few places.
2) Fixed a bug in voicemail section of pbx-asterisk init script which was causing the script to exit if no configuration for voicemail was found.
Diffstat (limited to 'applications/luci-pbx/root')
-rwxr-xr-xapplications/luci-pbx/root/etc/init.d/pbx-asterisk4
1 files changed, 2 insertions, 2 deletions
diff --git a/applications/luci-pbx/root/etc/init.d/pbx-asterisk b/applications/luci-pbx/root/etc/init.d/pbx-asterisk
index fdd01d76be..6b4808b730 100755
--- a/applications/luci-pbx/root/etc/init.d/pbx-asterisk
+++ b/applications/luci-pbx/root/etc/init.d/pbx-asterisk
@@ -601,7 +601,7 @@ pbx_configure_voicemail()
config_get enabled global_voicemail enabled
# First check if voicemail is enabled.
- [ "$enabled" != "yes" ] && exit
+ [ "$enabled" != "yes" ] && return
config_get global_timeout global_voicemail global_timeout
#config_get global_email_addresses global_voicemail global_email_addresses
@@ -665,7 +665,7 @@ start() {
pbx_cook_sip_template
pbx_cook_rtp_template
- # Prepare sip.conf using settings from the "advanced" section.
+ # Prepare voicemail config.
config_unset
config_load ${MODULENAME}-voicemail
pbx_configure_voicemail