Name variable `storage_dir`

...rather than `storage`.

ref: commit ce96d95c5e5b29b3bcb69d6e5416f0bc6bfb88f7

diff --git a/conf/vanilla/autoload_configs/voicemail.conf.xml b/conf/vanilla/autoload_configs/voicemail.conf.xml
index 8052d611f1b0dd4f5860505fdc1f5fd1573eeffe..33d5a977602c3bf198f6ea0e166dc374813a82e4 100644 (file)
--- a/conf/vanilla/autoload_configs/voicemail.conf.xml
+++ b/conf/vanilla/autoload_configs/voicemail.conf.xml
@@ -64,7 +64,7 @@
         <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/>
         <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>
       </email>
-      <!--<param name="storage-dir" value="$${storage}"/>-->
+      <!--<param name="storage-dir" value="$${storage_dir}"/>-->
       <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
       <!--<param name="record-comment" value="Your Comment"/>-->
       <!--<param name="record-title" value="Your Title"/>-->

diff --git a/conf/vanilla/vars.xml b/conf/vanilla/vars.xml
index 0b161854fff1620b078a5acffe8218424f964ef0..28a6dc96fb579bf449ae176974394738a9d493eb 100644 (file)
--- a/conf/vanilla/vars.xml
+++ b/conf/vanilla/vars.xml
@@ -38,7 +38,7 @@
       temp_dir
       grammar_dir
       certs_dir
-      storage
+      storage_dir
       cache_dir
       core_uuid
       zrtp_enabled

diff --git a/src/switch_core.c b/src/switch_core.c
index 7d5af36c281febda4640ad437294a038ded54017..bf07f4645149291d4fd90f569a6b25b4761f4f47 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1738,7 +1738,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        switch_core_set_variable("temp_dir", SWITCH_GLOBAL_dirs.temp_dir);
        switch_core_set_variable("grammar_dir", SWITCH_GLOBAL_dirs.grammar_dir);
        switch_core_set_variable("certs_dir", SWITCH_GLOBAL_dirs.certs_dir);
-       switch_core_set_variable("storage", SWITCH_GLOBAL_dirs.storage_dir);
+       switch_core_set_variable("storage_dir", SWITCH_GLOBAL_dirs.storage_dir);
        switch_core_set_variable("cache_dir", SWITCH_GLOBAL_dirs.cache_dir);
        switch_core_set_serial();