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

- removing deprecated legacy_cron entry from database

Browse Source 
- minor changes for multiserver-support
This commit is contained in:
Michael Kaufmann (d00p)
2010-10-18 09:48:26 +00:00
parent 699f451234
commit 3a9813c1b5
5 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
install/froxlor.sql
View File

@@ -466,7 +466,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.14-svn7'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.14-svn8');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');
@@ -1004,13 +1004,12 @@ CREATE TABLE IF NOT EXISTS `cronjobs_run` (
# #
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (1, 'froxlor/core', 'cron_tasks.php', '5 MINUTE', '1', 'cron_tasks'); INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (1, 'froxlor/core', 'cron_tasks.php', '5 MINUTE', '1', 'cron_tasks');
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (2, 'froxlor/core', 'cron_legacy.php', '5 MINUTE', '1', 'cron_legacy'); INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (2, 'froxlor/aps', 'cron_apsinstaller.php', '5 MINUTE', '0', 'cron_apsinstaller');
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (3, 'froxlor/aps', 'cron_apsinstaller.php', '5 MINUTE', '0', 'cron_apsinstaller'); INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (3, 'froxlor/autoresponder', 'cron_autoresponder.php', '5 MINUTE', '0', 'cron_autoresponder');
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (4, 'froxlor/autoresponder', 'cron_autoresponder.php', '5 MINUTE', '0', 'cron_autoresponder'); INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (4, 'froxlor/aps', 'cron_apsupdater.php', '1 HOUR', '0', 'cron_apsupdater');
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (5, 'froxlor/aps', 'cron_apsupdater.php', '1 HOUR', '0', 'cron_apsupdater'); INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (5, 'froxlor/core', 'cron_traffic.php', '1 DAY', '1', 'cron_traffic');
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (6, 'froxlor/core', 'cron_traffic.php', '1 DAY', '1', 'cron_traffic'); INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (6, 'froxlor/ticket', 'cron_used_tickets_reset.php', '1 DAY', '1', 'cron_ticketsreset');
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (7, 'froxlor/ticket', 'cron_used_tickets_reset.php', '1 DAY', '1', 'cron_ticketsreset'); INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (7, 'froxlor/ticket', 'cron_ticketarchive.php', '1 MONTH', '1', 'cron_ticketarchive');
INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (8, 'froxlor/ticket', 'cron_ticketarchive.php', '1 MONTH', '1', 'cron_ticketarchive');
# -------------------------------------------------------- # --------------------------------------------------------

11
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -1274,3 +1274,14 @@ if(isFroxlorVersion('0.9.14-svn6'))
updateToVersion('0.9.14-svn7'); updateToVersion('0.9.14-svn7');
} }
if(isFroxlorVersion('0.9.14-svn7'))
{
showUpdateStep("Updating from 0.9.14-svn7 to 0.9.14-svn8", false);
showUpdateStep("Removing deprecated legacy-cronjob from database");
$db->query("DELETE FROM `".TABLE_PANEL_CRONRUNS."` WHERE `cronfile` ='cron_legacy.php';");
lastStepStatus(0);
updateToVersion('0.9.14-svn8');
}

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

@@ -107,26 +107,41 @@ class froxlorclient
public function Deploy() public function Deploy()
{ {
// get FroxlorSshTransport-object // get FroxlorSshTransport-object
if($this->_getSetting('client', 'deploy_mode') !== null $ssh = null;
&& $this->_getSetting('client', 'deploy_mode') == 'pubkey' try {
) { if($this->_getSetting('client', 'deploy_mode') !== null
$ssh = FroxlorSshTransport::usePublicKey( && $this->_getSetting('client', 'deploy_mode') == 'pubkey'
$this->_getSetting('client', 'hostname'), ) {
$this->_getSetting('client', 'ssh_port'), $ssh = FroxlorSshTransport::usePublicKey(
$this->_getSetting('client', 'ssh_user'), $this->_getSetting('client', 'hostname'),
$this->_getSetting('client', 'ssh_pubkey'), $this->_getSetting('client', 'ssh_port'),
$this->_getSetting('client', 'ssh_privkey'), $this->_getSetting('client', 'ssh_user'),
$this->_getSetting('client', 'ssh_passphrase') $this->_getSetting('client', 'ssh_pubkey'),
); $this->_getSetting('client', 'ssh_privkey'),
} else if($this->_getSetting('client', 'deploy_mode') !== null) { $this->_getSetting('client', 'ssh_passphrase')
$ssh = FroxlorSshTransport::usePlainPassword( );
$this->_getSetting('client', 'hostname'), } else if($this->_getSetting('client', 'deploy_mode') !== null) {
$this->_getSetting('client', 'ssh_port'), $ssh = FroxlorSshTransport::usePlainPassword(
$this->_getSetting('client', 'ssh_user'), $this->_getSetting('client', 'hostname'),
$this->_getSetting('client', 'ssh_passphrase') $this->_getSetting('client', 'ssh_port'),
); $this->_getSetting('client', 'ssh_user'),
} else { $this->_getSetting('client', 'ssh_passphrase')
throw new Exception('NO_DEPLOY_METHOD_GIVEN'); );
} 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();
} }
} }
@@ -353,6 +368,10 @@ class froxlorclient
{ {
$this->Set($field, $value, true, true); $this->Set($field, $value, true, true);
} }
// after we have details about the client,
// we need its settings too
$this->_readSettings();
} }
} }
} }

2
lib/classes/sshtransport/class.FroxlorSshTransport.php
View File

@@ -309,4 +309,4 @@ class FroxlorSshTransport
} }
} }
} }
?>

2
lib/tables.inc.php
View File

@@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO // VERSION INFO
$version = '0.9.14-svn7'; $version = '0.9.14-svn8';
$dbversion = '2'; $dbversion = '2';
$branding = ''; $branding = '';