Show
Ignore:
Timestamp:
08/07/07 21:33:45 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 4751 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.3

........

r4751 | p_lindheimer | 2007-08-07 18:31:32 -0700 (Tue, 07 Aug 2007) | 1 line


#2231 restore astdb as part of configuration restore choice

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.2

    • Property svnmerge-integrated changed from /modules/branches/2.1:1-2166,2289,2414,2419,2424,2430,2449,2458,2462,2476 /modules/branches/2.3:1-3256,4102,4227,4232,4251,4312,4390,4570,4574,4579,4583,4587,4595,4600 to /modules/branches/2.1:1-2166,2289,2414,2419,2424,2430,2449,2458,2462,2476 /modules/branches/2.3:1-3256,4102,4227,4232,4251,4312,4390,4570,4574,4579,4583,4587,4595,4600,4751

  • modules/branches/2.2/backup/module.xml

    r4059 r4752  
    22  <rawname>backup</rawname> 
    33  <name>Backup &amp; Restore</name> 
    4   <version>2.1.1</version> 
     4  <version>2.1.1.1</version> 
    55  <type>tool</type> 
    66  <category>System Administration</category> 
    …… 
    1212  </depends> 
    1313  <changelog> 
     14  *2.1.1.1* #2231 restore astdb as part of configuration restore choice 
    1415  *2.1.1* Remove core_users2astdb and core_devices2astdb, it isn't needed and corrupts resotred ampuser info 
    1516  *2.1* Actually, really, restore ASTDB now. Finally. Also add redirect_standard to avoid problems with TRBoE. 

  • modules/branches/2.2/backup/schedule_functions.php

    r3229 r4752  
    132132    $tar_cmd="tar -PxvOz -f \"$dir\" /tmp/ampbackups.$fileholder/configurations.tar.gz | tar -Pxvz"; 
    133133    exec($tar_cmd); 
    134     $tar_cmd="tar -Pxvz -f \"$dir\" /tmp/ampbackups.$fileholder/asterisk.sql"; 
     134    $tar_cmd="tar -Pxvz -f \"$dir\" /tmp/ampbackups.$fileholder/asterisk.sql /tmp/ampbackups.$fileholder/astdb.dump"; 
    135135    exec($tar_cmd); 
    136136    $sql_cmd="mysql -u $amp_conf[AMPDBUSER] -p$amp_conf[AMPDBPASS] < /tmp/ampbackups.$fileholder/asterisk.sql"; 
    137137    exec($sql_cmd); 
    138                 exec('/bin/rm -rf /tmp/ampbackups.$fileholder'); 
     138    exec($asterisk_conf['astvarlibdir']."/bin/restoreastdb.php $fileholder"); 
     139    exec('/bin/rm -rf /tmp/ampbackups.$fileholder'); 
    139140  } else if($filetype=="FOP"){ 
    140141    $Message="Restored Operator Panel";