Merge branch 'master' of github.com:dhubler/sipxecs

SIPfoundry · Jan 25, 2013 · baba350 · baba350
2 parents 4f1c903 + aeb454b
commit baba350
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sipXconfig/bin/sipxconfig-archive.in b/sipXconfig/bin/sipxconfig-archive.in
@@ -120,9 +120,9 @@ class Restore < ArchiveBase
       cmd "mongorestore --db profiles --collection userProfile #{@tmpdir}/dump/profiles/userProfile.bson" or 
         raise "Failed to restore user profiles database"
       cmd "mongorestore --db profiles --collection fs.files #{@tmpdir}/dump/profiles/fs.files.bson" or 
-        raise "Failed to restore avatar database"
+        cmd "echo Failed to restore avatar database"
       cmd "mongorestore --db profiles --collection fs.chunks #{@tmpdir}/dump/profiles/fs.chunks.bson" or 
-        raise "Failed to restore avatar database"
+        cmd "echo Failed to restore avatar database"
     else
       sql_exec(@restoredb, "insert into setup(setup_id) values ('migrate_profiles');") or
           raise "Failed to trigger user profile migration."

diff --git a/sipXfreeSwitch/etc/sipxfreeswitch.cf b/sipXfreeSwitch/etc/sipxfreeswitch.cf
@@ -84,7 +84,7 @@ bundle agent sipxfreeswitch_config {
 
 bundle edit_line sipxfreeswitch_modules {
   classes:
-    "fs_g729" expression => fileexists("$(sipx.FREESWITCH_PREEFIX)/mod/mod_com_g729.so");
+    "fs_g729" expression => fileexists("$(sipx.FREESWITCH_PREFIX)/mod/mod_com_g729.so");
 
   insert_lines: