Changeset 7128

Show
Ignore:
Timestamp:
10/24/08 16:03:02 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7126-7127 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7126 | p_lindheimer | 2008-10-24 13:00:28 -0700 (Fri, 24 Oct 2008) | 1 line


fixes #3323 ampbackup.pl fails when zaptel.conf or dahdi dir not there

........

r7127 | p_lindheimer | 2008-10-24 13:01:21 -0700 (Fri, 24 Oct 2008) | 1 line


Module Publish Script: backup 2.5.1.5

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7080,7098-7099 to /modules/branches/2.5:1-7080,7098-7099,7126-7127

  • modules/branches/2.6/backup

    • Property lastpublish changed from 6915 to 7126

  • modules/branches/2.6/backup/bin/ampbackup.pl

    r6594 r7128  
    192192  if ( $Backup_Configurations eq "yes" ){ 
    193193    system ($ast{'astvarlibdir'}."/bin/dumpastdb.php $Stamp > /dev/null"); 
    194     system ("/bin/tar -Pcz -f /tmp/ampbackups.$Stamp/configurations.tar.gz ".$ast{'astvarlibdir'}."/agi-bin/ ".$ast{'astvarlibdir'}."/bin/ /etc/asterisk $webroot/admin /etc/amportal.conf /etc/zaptel.conf /etc/dahdi /tmp/ampbackups.$Stamp/astdb.dump "); 
     194    $config_files = ""; 
     195    $config_files .= "/etc/zaptel.conf" if -r "/etc/zaptel.conf"; 
     196    $config_files .= "/etc/dahdi" if -r "/etc/dahdi"; 
     197    system ("/bin/tar -Pcz -f /tmp/ampbackups.$Stamp/configurations.tar.gz ".$ast{'astvarlibdir'}."/agi-bin/ ".$ast{'astvarlibdir'}."/bin/ /etc/asterisk $webroot/admin /etc/amportal.conf $config_files /tmp/ampbackups.$Stamp/astdb.dump "); 
    195198 
    196199    if ($provroot ne "") { 

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

    r6916 r7128  
    22  <rawname>backup</rawname> 
    33  <name>Backup &amp; Restore</name> 
    4   <version>2.5.1.4</version> 
     4  <version>2.5.1.5</version> 
    55  <type>tool</type> 
    66  <category>System Administration</category> 
    …… 
    1313  </depends> 
    1414  <changelog> 
     15    *2.5.1.5* #3323 backup fails if zaptel.conf or dahdi directory not present 
    1516    *2.5.1.4* #3238, spelling 
    1617    *2.5.1.3* description added to xml, Swedish 
    …… 
    2526    *2.4.0* CHANGELOG TRUNCATED See SVN Repository 
    2627  </changelog> 
    27   <location>release/2.5/backup-2.5.1.4.tgz</location> 
    28   <md5sum>b9ad203ada9fa14b38577f68a7be4f92</md5sum> 
     28  <location>release/2.5/backup-2.5.1.5.tgz</location> 
     29  <md5sum>bfa0dc686ca468a65e10ab25855ec5f0</md5sum> 
    2930</module>