malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hotfix fix #793 ;getestet auf Debian

Browse Source
This commit is contained in:
Daniel Rodriguez Baumann 2016-03-30 23:53:13 +02:00
parent 317a2f4819
commit 1cbe95af12
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/reboot.php
View File

@ -1,5 +1,4 @@
<?php
/**
* File: reboot.php.
* Author: Ulrich Block
@ -397,10 +396,11 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
}
$rawsnapshot = $connection->Snapshotcreate($localserverid);
$channelSnapshot = $connection->channelList($localserverid);
$snapshot = gzcompress($rawsnapshot, 9);
$query4 = $sql->prepare("INSERT INTO `voice_server_backup` (`sid`,`uid`,`name`,`snapshot`,`date`,`resellerid`) VALUES(?,?,?,?,NOW(),?)");
$query4->execute(array($ts3id, $ts3userid, $name, $snapshot, $resellerid));
$query4 = $sql->prepare("INSERT INTO `voice_server_backup` (`sid`,`uid`,`name`,`snapshot`,`channels`,`date`,`resellerid`) VALUES(?,?,?,?,?,NOW(),?)");
$query4->execute(array($ts3id, $ts3userid, $name, $snapshot, $channelSnapshot, $resellerid));
$query4 = $sql->prepare("SELECT `id` FROM `voice_server_backup` WHERE `sid`=? AND `uid`=? AND `resellerid`=? ORDER BY `id` DESC LIMIT 1");
$query4->execute(array($ts3id, $ts3userid, $resellerid));
@ -408,7 +408,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
$filefolder = 'files/virtualserver_' . $localserverid . '/';
$backupfolder = 'backups/virtualserver_' . $localserverid . '/';
$cmds[] ='cd '.$folders.' && function backup () { mkdir -p ' . $backupfolder . ' && nice -n +19 tar cfj ' . $backupfolder . $row4['id'] . '.tar.bz2 ' . $filefolder . '; }; backup& ';
$cmds[] ='cd '.$folders.' && function backup () { mkdir -p ' . $backupfolder . ' && nice -n +19 tar cfPj ' . $backupfolder . $row4['id'] . '.tar.bz2 ' . $filefolder . '; }; backup& ';
print "Creating backup for ts3 server: " . $row3['ip'] . ':' . $row3['port'] . "\r\n";
}

13
web/stuff/methods/functions_ts3.php
View File

@ -1,5 +1,4 @@
<?php
/**
* File: functions_ts3.php.
* Author: Ulrich Block
@ -52,7 +51,12 @@ function tsbackup ($action, $sshuser, $path, $ts3MasterID, $virtualserver_id, $b
$folderfilecount = count($split_config) - 1;
$i = 0;
if(!isset($path) || empty($path)){
$folders = '/home/'.$sshuser . '/';
}else{
$folders = (substr($path, 0, 1) == '/') ? '/' : '/home/'.$sshuser . '/';
}
while ($i <= $folderfilecount) {
$folders .= $split_config[$i] . '/';
@ -68,12 +72,12 @@ function tsbackup ($action, $sshuser, $path, $ts3MasterID, $virtualserver_id, $b
}
$filefolder = $folders . 'files/virtualserver_' . $virtualserver_id . '/';
var_dump($filefolder);
$backupfolder = $folders . 'backups/virtualserver_' . $virtualserver_id . '/';
if ($action == 'create') {
$function = 'function backup () { mkdir -p ' . $backupfolder . ' && nice -n +19 tar cfj ' . $backupfolder . $backupid . '.tar.bz2 ' . $filefolder . '; }';
$function = 'function backup () { mkdir -p ' . $backupfolder . ' && nice -n +19 tar cfPj ' . $backupfolder . $backupid . '.tar.bz2 ' . $filefolder . '; }';
} else if ($action == 'delete') {
@ -81,7 +85,7 @@ function tsbackup ($action, $sshuser, $path, $ts3MasterID, $virtualserver_id, $b
} else if ($action == 'deploy') {
$function = 'function backup () { nice -n +19 rm -rf ' . $filefolder . '* && nice -n +19 tar xfj ' . $backupfolder . $backupid . '.tar.bz2 -C /';
$function = 'function backup () { nice -n +19 rm -rf ' . $filefolder . '* && nice -n +19 tar xfPj ' . $backupfolder . $backupid . '.tar.bz2 -C /';
if (count($move) > 0) {
foreach ($move as $o => $n) {
@ -96,7 +100,6 @@ function tsbackup ($action, $sshuser, $path, $ts3MasterID, $virtualserver_id, $b
if (isset($function)) {
$ssh2cmd = 'cd ' . $folders . ' && ' . $function . '; backup& ';
if (ssh2_execute('vm', $ts3MasterID, $ssh2cmd) !== false) {
return 'ok';
} else {