maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- added multiserver-client-deploy-cron

Browse Source 
- outsourcing Deploy() function from froxlorclient to client_deployer
This commit is contained in:
Michael Kaufmann (d00p)
2010-10-20 09:01:34 +00:00
parent 836b7fb056
commit 0c9ab91373
4 changed files with 166 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/classes/froxlorclient/class.froxlorclient.php
View File

@@ -112,55 +112,6 @@ class froxlorclient
return $result;
}
/**
* This functions deploys the needed files
* to the client destination server
*
* @TODO
* - get information about what files need to be transfered
* - generate userdata.inc.php for client (db = master db)
*/
public function Deploy()
{
// get FroxlorSshTransport-object
$ssh = null;
try {
if($this->_getSetting('client', 'deploy_mode') !== null
&& $this->_getSetting('client', 'deploy_mode') == 'pubkey'
) {
$ssh = FroxlorSshTransport::usePublicKey(
$this->_getSetting('client', 'hostname'),
$this->_getSetting('client', 'ssh_port'),
$this->_getSetting('client', 'ssh_user'),
$this->_getSetting('client', 'ssh_pubkey'),
$this->_getSetting('client', 'ssh_privkey'),
$this->_getSetting('client', 'ssh_passphrase')
);
} else if($this->_getSetting('client', 'deploy_mode') !== null) {
$ssh = FroxlorSshTransport::usePlainPassword(
$this->_getSetting('client', 'hostname'),
$this->_getSetting('client', 'ssh_port'),
$this->_getSetting('client', 'ssh_user'),
$this->_getSetting('client', 'ssh_passphrase')
);
} else {
throw new Exception('NO_DEPLOY_METHOD_GIVEN');
}
} catch (Exception $e) {
return $e->getMessage();
}
if($ssh instanceof FroxlorSshTransport)
{
/**
* @TODO implement me
*/
// close the session
$ssh->close();
}
}
/**
* Insert new client to database
*/
@@ -300,7 +251,7 @@ class froxlorclient
*
* @return mixed or null if not found
*/
private function _getSetting($_grp = '', $_var = '', $_grptrusted = false, $_vartrusted = false)
public function getSetting($_grp = '', $_var = '', $_grptrusted = false, $_vartrusted = false)
{
if($_grp != ''
&& $_var != ''
@@ -337,7 +288,7 @@ class froxlorclient
* @param bool $_vartrusted
* @param bool $_valuetrusted
*/
private function _setSetting($_grp = '', $_var = '', $_value = '', $_grptrusted = false, $_vartrusted = false, $_valuetrusted = false)
public function setSetting($_grp = '', $_var = '', $_value = '', $_grptrusted = false, $_vartrusted = false, $_valuetrusted = false)
{
if($_grp != ''
&& $_var != ''
@@ -389,7 +340,7 @@ class froxlorclient
{
foreach($fv as $field => $value)
{
$this->_setSetting($group, $field, $value, true, true, true);
$this->setSetting($group, $field, $value, true, true, true);
}
}
}