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

minor work on multiserver-client-deployment

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-10-22 21:29:47 +00:00
parent 26084a19fa
commit 8b3c634652
4 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
actions/multiserver/clientsettings/999.froxlorclient.php
View File

@@ -92,7 +92,15 @@ return array(
'default' => '',
'string_emptyallowed' => true,
'save_method' => 'storeSettingField'
)
),
'froxlorclient_install_destination' => array(
'label' => $lng['froxlorclient']['install_destination'],
'settinggroup' => 'client',
'varname' => 'install_destination',
'type' => 'string',
'default' => '/usr/share/froxlor/',
'save_method' => 'storeSettingField'
),
)
)
)

5
lib/classes/sshtransport/class.FroxlorPkgCreator.php
View File

@@ -131,7 +131,10 @@ class FroxlorPkgCreator
*/
public function addFile($name, $data)
{
$this->_manualFiles[] = array("name" => $name, "data" => $data;
$this->_manualFiles[] = array(
'name' => $name,
'data' => $data
);
}
/**

3
lng/english.lng.php
View File

@@ -1529,6 +1529,7 @@ $lng['admin']['froxlorclients']['settings'] = 'settings';
$lng['admin']['froxlorclients']['deploy'] = 'deploy';
$lng['menue']['multiserver']['clients'] = 'Multiserver clients';
$lng['admin']['froxlorclient'] = 'Multiserver client settings';
$lng['admin']['froxlorclient_settings'] = 'Froxlor client settings:';
$lng['froxlorclient']['ipaddress'] = 'Client IP';
$lng['froxlorclient']['hostname'] = 'Client hostname';
$lng['froxlorclient']['deploy_mode'] = 'Deploy mode';
@@ -1537,6 +1538,6 @@ $lng['froxlorclient']['ssh_user'] = 'SSH user';
$lng['froxlorclient']['ssh_passphrase'] = 'SSH passphrase';
$lng['froxlorclient']['ssh_pubkey'] = 'SSH public key';
$lng['froxlorclient']['ssh_privkey'] = 'SSH private key';
$lng['admin']['froxlorclient_settings'] = 'Froxlor client settings:';
$lng['froxlorclient']['install_destination'] = 'Froxlor client data destination';
?>

44
scripts/jobs/cron_tasks.inc.multiserver.client_deploy.php
View File

@@ -76,24 +76,22 @@ class client_deployer
if($ssh instanceof FroxlorSshTransport)
{
/**
* @TODO implement me
*/
$time = time();
$deployList = "/tmp/froxlor_deploy_".$time.".txt";
$zipPath = "/tmp/froxlor_deploy_".$time.".zip";
$deployList = "/tmp/froxlor_deploy_".time().".txt";
$zipPath = "/tmp/froxlor_deploy_".time().".zip";
$remoteTo = "/var/ww/froxlor/"; // TODO setting variable?!
$remoteTo = $this->_client->getSetting('client', 'install_destination');
// TODO get a deploy configuration from database/panel?
// create the deploy list
$mypath = dirname(dirname((dirname(dirname(__FILE)))));
FroxlorDeployfileCreator::createList(
array(
"/var/www/froxlor/lib/",
"/var/www/froxlor/lng/",
"/var/www/froxlor/scripts/",
"/var/www/froxlor/actions/",
"/var/www/froxlor/templates/"
makeCorrectDir($mypath."/lib/"),
makeCorrectDir($mypath."/lng/"),
makeCorrectDir($mypath."/scripts/"),
makeCorrectDir($mypath."/actions/"),
makeCorrectDir($mypath."/templates/")
)
);
@@ -119,7 +117,8 @@ class client_deployer
private function _transferArchive($ssh, $from, $to)
{
if ($ssh->sendFile($from, $to)) {
return stat($from)['7'];
$filenfo = stat($from);
return $filenfo['7'];
} else {
return 0.0;
}
@@ -133,7 +132,7 @@ class client_deployer
*/
private function _prepareFiles($deployList, $toPath)
{
$pkg = FroxlorPkgCreator($deployList, $toPath);
$pkg = new FroxlorPkgCreator($deployList, $toPath);
/**
* create userdata file which
@@ -155,9 +154,24 @@ class client_deployer
* !!! don't forget to set $server_id to the correct value !!!
*
* @return string full path to the created file
*
* @TODO master-db settings
*/
private function _createUserdataFile()
{
return "Chuck Norris doesn't need a userdata.inc.php to run Froxlor!";
$userdata = '';
$userdata .= "<?php\n";
$userdata .= "// automatically generated userdata.inc.php for Froxlor-Client '".$this->_client->Get('name')."'\n";
$userdata .= "\$sql['host']='".$this->_client->getSetting('client', 'masterdb_host')."';\n";
$userdata .= "\$sql['user']='".$this->_client->getSetting('client', 'masterdb_usr')."';\n";
$userdata .= "\$sql['password']='".$this->_client->getSetting('client', 'masterdb_pwd')."';\n";
$userdata .= "\$sql['db']='".$this->_client->getSetting('client', 'masterdb_db')."';\n";
$userdata .= "\$sql_root[0]['caption']='Master database';\n";
$userdata .= "\$sql_root[0]['host']='".$this->_client->getSetting('client', 'masterdb_host')."';\n";
$userdata .= "\$sql_root[0]['user']='".$this->_client->getSetting('client', 'masterdb_rootusr')."';\n";
$userdata .= "\$sql_root[0]['password']='".$this->_client->getSetting('client', 'masterdb_rootpwd')."';\n";
$userdata .= "// Define our system id\n";
$userdata .= "\$server_id = ".(int)$this->_client->Get('id').";\n";
return $userdata;
}
}