diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 83155790b38566832ac5a8a15cd7d6475965b019..902ca02fa2d1b68a30ef55f466e5ff3b1c9897ef 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -29,7 +29,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ class installer_base { - + var $wb = array(); var $language = 'en'; var $db; @@ -38,70 +38,65 @@ class installer_base { public $is_update = false; // true if it is an update, falsi if it is a new install - public function __construct() - { - global $conf; //TODO: maybe $conf should be passed to constructor - //$this->conf = $conf; - } - - //: TODO Implement the translation function and language files for the installer. - public function lng($text) - { + public function __construct() { + global $conf; //TODO: maybe $conf should be passed to constructor + //$this->conf = $conf; + } + + //: TODO Implement the translation function and language files for the installer. + public function lng($text) { return $text; } - - public function error($msg) - { + + public function error($msg) { die("ERROR: ".$msg."\n"); } - - public function simple_query($query, $answers, $default) - { + + public function simple_query($query, $answers, $default) { $finished = false; do { $answers_str = implode(',', $answers); swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: '); $input = sread(); - + //* Stop the installation if($input == 'quit') { swriteln($this->lng("Installation terminated by user.\n")); die(); } - + //* Select the default if($input == '') { $answer = $default; $finished = true; } - - //* Set answer id valid + + //* Set answer id valid if(in_array($input, $answers)) { $answer = $input; $finished = true; } - + } while ($finished == false); swriteln(); return $answer; } - - public function free_query($query,$default) - { + + public function free_query($query,$default) { swrite($this->lng($query).' ['.$default.']: '); $input = sread(); - + //* Stop the installation if($input == 'quit') { - swriteln($this->lng("Installation terminated by user.\n")); - die(); + swriteln($this->lng("Installation terminated by user.\n")); + die(); } - - $answer = ($input == '') ? $default : $input; + + $answer = ($input == '') ? $default : $input; swriteln(); return $answer; } - + /* // TODO: this function is not used atmo I think - pedro function request_language(){ @@ -111,11 +106,11 @@ class installer_base { } */ - + //** Detect installed applications public function find_installed_apps() { global $conf; - + if(is_installed('mysql') || is_installed('mysqld')) $conf['mysql']['installed'] = true; if(is_installed('postfix')) $conf['postfix']['installed'] = true; if(is_installed('apache') || is_installed('apache2') || is_installed('httpd')) $conf['apache']['installed'] = true; @@ -130,77 +125,77 @@ class installer_base { if(is_installed('jk_chrootsh')) $conf['jailkit']['installed'] = true; if(is_installed('pdns_server') || is_installed('pdns_control')) $conf['powerdns']['installed'] = true; if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true; - + } - - /** Create the database for ISPConfig */ + + /** Create the database for ISPConfig */ public function configure_database() { global $conf; - + //** Create the database if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$conf['mysql']['database'].' DEFAULT CHARACTER SET '.$conf['mysql']['charset'])) { $this->error('Unable to create MySQL database: '.$conf['mysql']['database'].'.'); } - + //* Set the database name in the DB library $this->db->dbName = $conf['mysql']['database']; - + //* Load the database dump into the database, if database contains no tables $db_tables = $this->db->getTables(); if(count($db_tables) > 0) { $this->error('Stopped: Database already contains some tables.'); } else { if($conf['mysql']['admin_password'] == '') { - caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", - __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); + caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", + __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } else { caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", - __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); + __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } $db_tables = $this->db->getTables(); if(count($db_tables) == 0) { $this->error('Unable to load SQL-Dump into database table.'); } - + //* Load system.ini into the sys_ini table $system_ini = $this->db->quote(rf('tpl/system.ini.master')); $this->db->query("UPDATE sys_ini SET config = '$system_ini' WHERE sysini_id = 1"); - + } } - + //** Create the server record in the database public function add_database_server_record() { - + global $conf; - + if($conf['mysql']['host'] == 'localhost') { $from_host = 'localhost'; } else { $from_host = $conf['hostname']; } - + // Delete ISPConfig user in the local database, in case that it exists $this->db->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['ispconfig_user']."' AND Host = '".$from_host."';"); $this->db->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['database']."' AND Host = '".$from_host."';"); $this->db->query('FLUSH PRIVILEGES;'); - + //* Create the ISPConfig database user in the local database - $query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$conf['mysql']['database'].".* " - ."TO '".$conf['mysql']['ispconfig_user']."'@'".$from_host."' " - ."IDENTIFIED BY '".$conf['mysql']['ispconfig_password']."';"; + $query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$conf['mysql']['database'].".* " + ."TO '".$conf['mysql']['ispconfig_user']."'@'".$from_host."' " + ."IDENTIFIED BY '".$conf['mysql']['ispconfig_password']."';"; if(!$this->db->query($query)) { $this->error('Unable to create database user: '.$conf['mysql']['ispconfig_user'].' Error: '.$this->db->errorMessage); } - + //* Reload database privelages $this->db->query('FLUSH PRIVILEGES;'); - + //* Set the database name in the DB library $this->db->dbName = $conf['mysql']['database']; - + $tpl_ini_array = ini_to_array(rf('tpl/server.ini.master')); - + // TODO: Update further distribution specific parameters for server config here $tpl_ini_array['web']['vhost_conf_dir'] = $conf['apache']['vhost_conf_dir']; $tpl_ini_array['web']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_enabled_dir']; @@ -212,7 +207,7 @@ class installer_base { $tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir']; $tpl_ini_array['web']['website_path'] = $conf['web']['website_path']; $tpl_ini_array['web']['website_symlinks'] = $conf['web']['website_symlinks']; - $tpl_ini_array['cron']['crontab_dir'] = $conf['cron']['crontab_dir']; + $tpl_ini_array['cron']['crontab_dir'] = $conf['cron']['crontab_dir']; $tpl_ini_array['web']['security_level'] = 20; $tpl_ini_array['web']['user'] = $conf['apache']['user']; $tpl_ini_array['web']['group'] = $conf['apache']['group']; @@ -223,36 +218,36 @@ class installer_base { $tpl_ini_array['dns']['bind_zonefiles_dir'] = $conf['bind']['bind_zonefiles_dir']; $tpl_ini_array['dns']['named_conf_path'] = $conf['bind']['named_conf_path']; $tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path']; - + $server_ini_content = array_to_ini($tpl_ini_array); $server_ini_content = mysql_real_escape_string($server_ini_content); - + $mail_server_enabled = ($conf['services']['mail'])?1:0; $web_server_enabled = ($conf['services']['web'])?1:0; $dns_server_enabled = ($conf['services']['dns'])?1:0; $file_server_enabled = ($conf['services']['file'])?1:0; $db_server_enabled = ($conf['services']['db'])?1:0; $vserver_server_enabled = ($conf['services']['vserver'])?1:0; - - - + + + if($conf['mysql']['master_slave_setup'] == 'y') { - + //* Insert the server record in master DB $sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1);"; $this->dbmaster->query($sql); $conf['server_id'] = $this->dbmaster->insertID(); $conf['server_id'] = $conf['server_id']; - + //* Insert the same record in the local DB $sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES ('".$conf['server_id']."',1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1);"; $this->db->query($sql); - + //* username for the ispconfig user $conf['mysql']['master_ispconfig_user'] = 'ispcsrv'.$conf['server_id']; - - $this->grant_master_database_rights(); - + + $this->grant_master_database_rights(); + } else { //* Insert the server, if its not a mster / slave setup $sql = "INSERT INTO `server` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 'riud', 'riud', 'r', '".$conf['hostname']."', '$mail_server_enabled', '$web_server_enabled', '$dns_server_enabled', '$file_server_enabled', '$db_server_enabled', '$vserver_server_enabled', '$server_ini_content', 0, 1);"; @@ -260,317 +255,312 @@ class installer_base { $conf['server_id'] = $this->db->insertID(); $conf['server_id'] = $conf['server_id']; } - - + + } - - public function grant_master_database_rights() - { - global $conf; - - if($conf['mysql']['master_slave_setup'] != 'y') return; - - //* insert the ispconfig user in the remote server - $from_host = $conf['hostname']; - $from_ip = gethostbyname($conf['hostname']); - - //* Delete ISPConfig user in the master database, in case that it exists - $this->dbmaster->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['master_ispconfig_user']."' AND Host = '".$from_host."';"); - $this->dbmaster->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['master_database']."' AND Host = '".$from_host."';"); - $this->dbmaster->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['master_ispconfig_user']."' AND Host = '".$from_ip."';"); - $this->dbmaster->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['master_database']."' AND Host = '".$from_ip."';"); - $this->dbmaster->query('FLUSH PRIVILEGES;'); - - $hosts = array($from_host, $from_ip); - - foreach($hosts as $src_host) { - //* Create the ISPConfig database user in the remote database - $query = "GRANT SELECT ON ".$conf['mysql']['master_database'].".`server` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, INSERT ON ".$conf['mysql']['master_database'].".`sys_log` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, UPDATE(`status`) ON ".$conf['mysql']['master_database'].".`sys_datalog` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, UPDATE(`status`) ON ".$conf['mysql']['master_database'].".`software_update_inst` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - + + public function grant_master_database_rights() { + global $conf; + + if($conf['mysql']['master_slave_setup'] != 'y') return; + + //* insert the ispconfig user in the remote server + $from_host = $conf['hostname']; + $from_ip = gethostbyname($conf['hostname']); + + //* Delete ISPConfig user in the master database, in case that it exists + $this->dbmaster->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['master_ispconfig_user']."' AND Host = '".$from_host."';"); + $this->dbmaster->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['master_database']."' AND Host = '".$from_host."';"); + $this->dbmaster->query("DELETE FROM mysql.user WHERE User = '".$conf['mysql']['master_ispconfig_user']."' AND Host = '".$from_ip."';"); + $this->dbmaster->query("DELETE FROM mysql.db WHERE Db = '".$conf['mysql']['master_database']."' AND Host = '".$from_ip."';"); + $this->dbmaster->query('FLUSH PRIVILEGES;'); + + $hosts = array($from_host, $from_ip); + + foreach($hosts as $src_host) { + //* Create the ISPConfig database user in the remote database + $query = "GRANT SELECT ON ".$conf['mysql']['master_database'].".`server` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, INSERT ON ".$conf['mysql']['master_database'].".`sys_log` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, UPDATE(`status`) ON ".$conf['mysql']['master_database'].".`sys_datalog` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, UPDATE(`status`) ON ".$conf['mysql']['master_database'].".`software_update_inst` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + $query = "GRANT SELECT, UPDATE(`updated`) ON ".$conf['mysql']['master_database'].".`server` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`) ON ".$conf['mysql']['master_database'].".`web_domain` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT ON ".$conf['mysql']['master_database'].".`sys_group` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, UPDATE (`action_status`, `response`) ON ".$conf['mysql']['master_database'].".`sys_remoteaction` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, INSERT , DELETE ON ".$conf['mysql']['master_database'].".`monitor_data` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, INSERT, UPDATE ON ".$conf['mysql']['master_database'].".`mail_traffic` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - $query = "GRANT SELECT, INSERT, UPDATE ON ".$conf['mysql']['master_database'].".`web_traffic` " - ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " - ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; - if(!$this->dbmaster->query($query)) { - $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); - } - - } - - } - - //** writes postfix configuration files - public function process_postfix_config($configfile) - { + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`) ON ".$conf['mysql']['master_database'].".`web_domain` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT ON ".$conf['mysql']['master_database'].".`sys_group` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, UPDATE (`action_status`, `response`) ON ".$conf['mysql']['master_database'].".`sys_remoteaction` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, INSERT , DELETE ON ".$conf['mysql']['master_database'].".`monitor_data` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, INSERT, UPDATE ON ".$conf['mysql']['master_database'].".`mail_traffic` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + $query = "GRANT SELECT, INSERT, UPDATE ON ".$conf['mysql']['master_database'].".`web_traffic` " + ."TO '".$conf['mysql']['master_ispconfig_user']."'@'".$src_host."' " + ."IDENTIFIED BY '".$conf['mysql']['master_ispconfig_password']."';"; + if(!$this->dbmaster->query($query)) { + $this->error('Unable to create database user in master database: '.$conf['mysql']['master_ispconfig_user'].' Error: '.$this->dbmaster->errorMessage); + } + + } + + } + + //** writes postfix configuration files + public function process_postfix_config($configfile) { global $conf; - - $config_dir = $conf['postfix']['config_dir'].'/'; - $full_file_name = $config_dir.$configfile; - //* Backup exiting file - if(is_file($full_file_name)){ - copy($full_file_name, $config_dir.$configfile.'~'); - } - $content = rf('tpl/'.$configfile.'.master'); - $content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content); - $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content); - $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content); - $content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content); - $content = str_replace('{server_id}', $conf['server_id'], $content); - wf($full_file_name, $content); - } - - public function configure_jailkit() - { - global $conf; - + + $config_dir = $conf['postfix']['config_dir'].'/'; + $full_file_name = $config_dir.$configfile; + //* Backup exiting file + if(is_file($full_file_name)) { + copy($full_file_name, $config_dir.$configfile.'~'); + } + $content = rf('tpl/'.$configfile.'.master'); + $content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content); + $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content); + $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content); + $content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content); + $content = str_replace('{server_id}', $conf['server_id'], $content); + wf($full_file_name, $content); + } + + public function configure_jailkit() { + global $conf; + $cf = $conf['jailkit']; $config_dir = $cf['config_dir']; $jk_init = $cf['jk_init']; $jk_chrootsh = $cf['jk_chrootsh']; - - if (is_dir($config_dir)) - { + + if (is_dir($config_dir)) { if(is_file($config_dir.'/'.$jk_init)) copy($config_dir.'/'.$jk_init, $config_dir.'/'.$jk_init.'~'); if(is_file($config_dir.'/'.$jk_chrootsh.".master")) copy($config_dir.'/'.$jk_chrootsh.".master", $config_dir.'/'.$jk_chrootsh.'~'); - + copy('tpl/'.$jk_init.".master", $config_dir.'/'.$jk_init); copy('tpl/'.$jk_chrootsh.".master", $config_dir.'/'.$jk_chrootsh); } - - } - - public function configure_postfix($options = '') - { - global $conf; + + } + + public function configure_postfix($options = '') { + global $conf; $cf = $conf['postfix']; $config_dir = $cf['config_dir']; - - if(!is_dir($config_dir)){ - $this->error("The postfix configuration directory '$config_dir' does not exist."); - } - + + if(!is_dir($config_dir)) { + $this->error("The postfix configuration directory '$config_dir' does not exist."); + } + //* mysql-virtual_domains.cf - $this->process_postfix_config('mysql-virtual_domains.cf'); + $this->process_postfix_config('mysql-virtual_domains.cf'); //* mysql-virtual_forwardings.cf - $this->process_postfix_config('mysql-virtual_forwardings.cf'); + $this->process_postfix_config('mysql-virtual_forwardings.cf'); //* mysql-virtual_mailboxes.cf - $this->process_postfix_config('mysql-virtual_mailboxes.cf'); + $this->process_postfix_config('mysql-virtual_mailboxes.cf'); //* mysql-virtual_email2email.cf - $this->process_postfix_config('mysql-virtual_email2email.cf'); + $this->process_postfix_config('mysql-virtual_email2email.cf'); //* mysql-virtual_transports.cf - $this->process_postfix_config('mysql-virtual_transports.cf'); + $this->process_postfix_config('mysql-virtual_transports.cf'); //* mysql-virtual_recipient.cf - $this->process_postfix_config('mysql-virtual_recipient.cf'); + $this->process_postfix_config('mysql-virtual_recipient.cf'); //* mysql-virtual_sender.cf - $this->process_postfix_config('mysql-virtual_sender.cf'); + $this->process_postfix_config('mysql-virtual_sender.cf'); //* mysql-virtual_client.cf - $this->process_postfix_config('mysql-virtual_client.cf'); - + $this->process_postfix_config('mysql-virtual_client.cf'); + //* mysql-virtual_relaydomains.cf - $this->process_postfix_config('mysql-virtual_relaydomains.cf'); - + $this->process_postfix_config('mysql-virtual_relaydomains.cf'); + //* mysql-virtual_relayrecipientmaps.cf - $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf'); + $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf'); //* Changing mode and group of the new created config files. caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null', - __FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed'); - caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null', - __FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed'); - + __FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed'); + caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null', + __FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed'); + //* Creating virtual mail user and group $command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname']; if(!is_group($cf['vmail_groupname'])) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); $command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m'; - if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); $postconf_commands = array ( - 'myhostname = '.$conf['hostname'], - 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain', - 'mynetworks = 127.0.0.0/8 [::1]/128', - 'virtual_alias_domains =', - 'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf', - 'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf', - 'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf', - 'virtual_mailbox_base = '.$cf['vmail_mailbox_base'], - 'virtual_uid_maps = static:'.$cf['vmail_userid'], - 'virtual_gid_maps = static:'.$cf['vmail_groupid'], - 'smtpd_sasl_auth_enable = yes', - 'broken_sasl_auth_clients = yes', - 'smtpd_sasl_authenticated_header = yes', - 'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination', - 'smtpd_use_tls = yes', - 'smtpd_tls_security_level = may', - 'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert', - 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', - 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', - 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', - 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', - 'virtual_create_maildirsize = yes', - 'virtual_maildir_extended = yes', - 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', - 'virtual_mailbox_limit_override = yes', - 'virtual_maildir_limit_message = "The user you are trying to reach is over quota."', - 'virtual_overquota_bounce = yes', - 'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps', - 'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf', - 'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf', - 'maildrop_destination_concurrency_limit = 1', - 'maildrop_destination_recipient_limit = 1', - 'virtual_transport = maildrop', - 'header_checks = regexp:'.$config_dir.'/header_checks', - 'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks', - 'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks', - 'body_checks = regexp:'.$config_dir.'/body_checks' + 'myhostname = '.$conf['hostname'], + 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain', + 'mynetworks = 127.0.0.0/8 [::1]/128', + 'virtual_alias_domains =', + 'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf', + 'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf', + 'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf', + 'virtual_mailbox_base = '.$cf['vmail_mailbox_base'], + 'virtual_uid_maps = static:'.$cf['vmail_userid'], + 'virtual_gid_maps = static:'.$cf['vmail_groupid'], + 'smtpd_sasl_auth_enable = yes', + 'broken_sasl_auth_clients = yes', + 'smtpd_sasl_authenticated_header = yes', + 'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination', + 'smtpd_use_tls = yes', + 'smtpd_tls_security_level = may', + 'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert', + 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', + 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', + 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', + 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', + 'virtual_create_maildirsize = yes', + 'virtual_maildir_extended = yes', + 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', + 'virtual_mailbox_limit_override = yes', + 'virtual_maildir_limit_message = "The user you are trying to reach is over quota."', + 'virtual_overquota_bounce = yes', + 'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps', + 'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf', + 'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf', + 'maildrop_destination_concurrency_limit = 1', + 'maildrop_destination_recipient_limit = 1', + 'virtual_transport = maildrop', + 'header_checks = regexp:'.$config_dir.'/header_checks', + 'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks', + 'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks', + 'body_checks = regexp:'.$config_dir.'/body_checks' ); - + //* Create the header and body check files touch($config_dir.'/header_checks'); touch($config_dir.'/mime_header_checks'); touch($config_dir.'/nested_header_checks'); touch($config_dir.'/body_checks'); - - + + //* Make a backup copy of the main.cf file copy($config_dir.'/main.cf', $config_dir.'/main.cf~'); - + //* Executing the postconf commands foreach($postconf_commands as $cmd) { $command = "postconf -e '$cmd'"; caselog($command." &> /dev/null", __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command); } - + if(!stristr($options,'dont-create-certs')) { //* Create the SSL certificate $command = 'cd '.$config_dir.'; ' - .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509'; + .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509'; exec($command); - + $command = 'chmod o= '.$config_dir.'/smtpd.key'; caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command); } - + //** We have to change the permissions of the courier authdaemon directory to make it accessible for maildrop. $command = 'chmod 755 /var/run/courier/authdaemon/'; caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command); - + //* Changing maildrop lines in posfix master.cf - if(is_file($config_dir.'/master.cf')){ - copy($config_dir.'/master.cf', $config_dir.'/master.cf~'); - } - if(is_file($config_dir.'/master.cf~')){ - exec('chmod 400 '.$config_dir.'/master.cf~'); - } + if(is_file($config_dir.'/master.cf')) { + copy($config_dir.'/master.cf', $config_dir.'/master.cf~'); + } + if(is_file($config_dir.'/master.cf~')) { + exec('chmod 400 '.$config_dir.'/master.cf~'); + } $configfile = $config_dir.'/master.cf'; $content = rf($configfile); - $content = str_replace('flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}', - 'flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d '.$cf['vmail_username'].' ${extension} ${recipient} ${user} ${nexthop} ${sender}', - $content); + $content = str_replace('flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}', + 'flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d '.$cf['vmail_username'].' ${extension} ${recipient} ${user} ${nexthop} ${sender}', + $content); wf($configfile, $content); - + //* Writing the Maildrop mailfilter file $configfile = 'mailfilter'; - if(is_file($cf['vmail_mailbox_base'].'/.'.$configfile)){ - copy($cf['vmail_mailbox_base'].'/.'.$configfile, $cf['vmail_mailbox_base'].'/.'.$configfile.'~'); - } + if(is_file($cf['vmail_mailbox_base'].'/.'.$configfile)) { + copy($cf['vmail_mailbox_base'].'/.'.$configfile, $cf['vmail_mailbox_base'].'/.'.$configfile.'~'); + } $content = rf("tpl/$configfile.master"); $content = str_replace('{dist_postfix_vmail_mailbox_base}', $cf['vmail_mailbox_base'], $content); wf($cf['vmail_mailbox_base'].'/.'.$configfile, $content); - + //* Create the directory for the custom mailfilters if(!is_dir($cf['vmail_mailbox_base'].'/mailfilters')) { $command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters'; caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } - + //* Chmod and chown the .mailfilter file $command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter'; caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + $command = 'chmod -R 600 '.$cf['vmail_mailbox_base'].'/.mailfilter'; caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + } - + public function configure_saslauthd() { global $conf; - - + + $configfile = 'sasl_smtpd.conf'; if(is_file($conf["postfix"]["config_dir"].'/sasl/smtpd.conf')) copy($conf["postfix"]["config_dir"].'/sasl/smtpd.conf',$conf["postfix"]["config_dir"].'/sasl/smtpd.conf~'); if(is_file($conf["postfix"]["config_dir"].'/sasl/smtpd.conf~')) exec('chmod 400 '.$conf["postfix"]["config_dir"].'/sasl/smtpd.conf~'); @@ -580,14 +570,14 @@ class installer_base { $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); $content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content); wf($conf["postfix"]["config_dir"].'/sasl/smtpd.conf',$content); - + // TODO: Chmod and chown on the config file - - - + + + // Create the spool directory exec('mkdir -p /var/spool/postfix/var/run/saslauthd'); - + // Edit the file /etc/default/saslauthd $configfile = $conf["saslauthd"]["config"]; if(is_file($configfile)) copy($configfile,$configfile.'~'); @@ -599,21 +589,20 @@ class installer_base { // Ubuntu $content = str_replace('OPTIONS="-c -m /var/run/saslauthd"','OPTIONS="-c -m /var/spool/postfix/var/run/saslauthd -r"',$content); wf($configfile,$content); - + // Edit the file /etc/init.d/saslauthd $configfile = $conf["init_scripts"].'/'.$conf["saslauthd"]["init_script"]; $content = rf($configfile); $content = str_replace('PIDFILE=$RUN_DIR/saslauthd.pid','PIDFILE="/var/spool/postfix/var/run/${NAME}/saslauthd.pid"',$content); wf($configfile,$content); - + // add the postfix user to the sasl group (at least nescessary for ubuntu 8.04 and most likely debian lenny too. exec('adduser postfix sasl'); - - + + } - - public function configure_pam() - { + + public function configure_pam() { global $conf; $pam = $conf['pam']; //* configure pam for SMTP authentication agains the ispconfig database @@ -629,18 +618,17 @@ class installer_base { wf("$pam/smtp", $content); exec("chmod 660 $pam/smtp"); exec("chown daemon:daemon $pam/smtp"); - + } - - public function configure_courier() - { + + public function configure_courier() { global $conf; $config_dir = $conf['courier']['config_dir']; //* authmysqlrc $configfile = 'authmysqlrc'; - if(is_file("$config_dir/$configfile")){ - copy("$config_dir/$configfile", "$config_dir/$configfile~"); - } + if(is_file("$config_dir/$configfile")) { + copy("$config_dir/$configfile", "$config_dir/$configfile~"); + } exec("chmod 400 $config_dir/$configfile~"); $content = rf("tpl/$configfile.master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); @@ -648,36 +636,35 @@ class installer_base { $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); $content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content); wf("$config_dir/$configfile", $content); - + exec("chmod 660 $config_dir/$configfile"); exec("chown daemon:daemon $config_dir/$configfile"); - + //* authdaemonrc $configfile = $conf['courier']['config_dir'].'/authdaemonrc'; - if(is_file($configfile)){ - copy($configfile, $configfile.'~'); - } - if(is_file($configfile.'~')){ - exec('chmod 400 '.$configfile.'~'); - } + if(is_file($configfile)) { + copy($configfile, $configfile.'~'); + } + if(is_file($configfile.'~')) { + exec('chmod 400 '.$configfile.'~'); + } $content = rf($configfile); $content = str_replace('authmodulelist="authpam"', 'authmodulelist="authmysql"', $content); wf($configfile, $content); } - - public function configure_dovecot() - { + + public function configure_dovecot() { global $conf; - + $config_dir = $conf['dovecot']['config_dir']; - + //* Configure master.cf and add a line for deliver - if(is_file($config_dir.'/master.cf')){ - copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); - } - if(is_file($config_dir.'/master.cf~')){ - exec('chmod 400 '.$config_dir.'/master.cf~2'); - } + if(is_file($config_dir.'/master.cf')) { + copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); + } + if(is_file($config_dir.'/master.cf~')) { + exec('chmod 400 '.$config_dir.'/master.cf~2'); + } $content = rf($conf["postfix"]["config_dir"].'/master.cf'); // Only add the content if we had not addded it before if(!stristr($content,"dovecot/deliver")) { @@ -686,38 +673,38 @@ class installer_base { } unset($content); unset($deliver_content); - - + + //* Reconfigure postfix to use dovecot authentication // Adding the amavisd commands to the postfix configuration $postconf_commands = array ( - 'dovecot_destination_recipient_limit = 1', - 'virtual_transport = dovecot', - 'smtpd_sasl_type = dovecot', - 'smtpd_sasl_path = private/auth' + 'dovecot_destination_recipient_limit = 1', + 'virtual_transport = dovecot', + 'smtpd_sasl_type = dovecot', + 'smtpd_sasl_path = private/auth' ); - + // Make a backup copy of the main.cf file copy($conf["postfix"]["config_dir"].'/main.cf',$conf["postfix"]["config_dir"].'/main.cf~3'); - + // Executing the postconf commands foreach($postconf_commands as $cmd) { $command = "postconf -e '$cmd'"; caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } - + //* copy dovecot.conf $configfile = 'dovecot.conf'; - if(is_file("$config_dir/$configfile")){ - copy("$config_dir/$configfile", "$config_dir/$configfile~"); - } + if(is_file("$config_dir/$configfile")) { + copy("$config_dir/$configfile", "$config_dir/$configfile~"); + } copy('tpl/debian_dovecot.conf.master',"$config_dir/$configfile"); - + //* dovecot-sql.conf $configfile = 'dovecot-sql.conf'; - if(is_file("$config_dir/$configfile")){ - copy("$config_dir/$configfile", "$config_dir/$configfile~"); - } + if(is_file("$config_dir/$configfile")) { + copy("$config_dir/$configfile", "$config_dir/$configfile~"); + } exec("chmod 400 $config_dir/$configfile~"); $content = rf("tpl/debian_dovecot-sql.conf.master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); @@ -725,15 +712,15 @@ class installer_base { $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); $content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content); wf("$config_dir/$configfile", $content); - + exec("chmod 600 $config_dir/$configfile"); exec("chown root:root $config_dir/$configfile"); } - + public function configure_amavis() { global $conf; - + // amavisd user config file $configfile = 'amavisd_user_config'; if(is_file($conf["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["amavis"]["config_dir"].'/conf.d/50-user',$conf["amavis"]["config_dir"].'/50-user~'); @@ -745,25 +732,25 @@ class installer_base { $content = str_replace('{mysql_server_port}',$conf["mysql"]["port"],$content); $content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content); wf($conf["amavis"]["config_dir"].'/conf.d/50-user',$content); - + // TODO: chmod and chown on the config file - - + + // Adding the amavisd commands to the postfix configuration $postconf_commands = array ( - 'content_filter = amavis:[127.0.0.1]:10024', - 'receive_override_options = no_address_mappings' + 'content_filter = amavis:[127.0.0.1]:10024', + 'receive_override_options = no_address_mappings' ); - + // Make a backup copy of the main.cf file copy($conf["postfix"]["config_dir"].'/main.cf',$conf["postfix"]["config_dir"].'/main.cf~2'); - + // Executing the postconf commands foreach($postconf_commands as $cmd) { $command = "postconf -e '$cmd'"; caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } - + // Append the configuration for amavisd to the master.cf file if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf',$conf["postfix"]["config_dir"].'/master.cf~'); $content = rf($conf["postfix"]["config_dir"].'/master.cf'); @@ -774,60 +761,57 @@ class installer_base { af($conf["postfix"]["config_dir"].'/master.cf',$content); } unset($content); - + // Add the clamav user to the amavis group exec('adduser clamav amavis'); - - + + } - - public function configure_spamassassin() - { + + public function configure_spamassassin() { global $conf; - + //* Enable spamasasssin on debian and ubuntu $configfile = '/etc/default/spamassassin'; - if(is_file($configfile)){ - copy($configfile, $configfile.'~'); - } + if(is_file($configfile)) { + copy($configfile, $configfile.'~'); + } $content = rf($configfile); $content = str_replace('ENABLED=0', 'ENABLED=1', $content); wf($configfile, $content); } - - public function configure_getmail() - { + + public function configure_getmail() { global $conf; - + $config_dir = $conf['getmail']['config_dir']; - + if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir)); $command = "useradd -d $config_dir getmail"; if(!is_user('getmail')) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + $command = "chown -R getmail $config_dir"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + $command = "chmod -R 700 $config_dir"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } - - - public function configure_pureftpd() - { + + + public function configure_pureftpd() { global $conf; - + $config_dir = $conf['pureftpd']['config_dir']; //* configure pure-ftpd for MySQL authentication against the ispconfig database $configfile = 'db/mysql.conf'; - if(is_file("$config_dir/$configfile")){ - copy("$config_dir/$configfile", "$config_dir/$configfile~"); - } - if(is_file("$config_dir/$configfile~")){ - exec("chmod 400 $config_dir/$configfile~"); - } + if(is_file("$config_dir/$configfile")) { + copy("$config_dir/$configfile", "$config_dir/$configfile~"); + } + if(is_file("$config_dir/$configfile~")) { + exec("chmod 400 $config_dir/$configfile~"); + } $content = rf('tpl/pureftpd_mysql.conf.master'); $content = str_replace('{mysql_server_ispconfig_user}', $conf["mysql"]["ispconfig_user"], $content); $content = str_replace('{mysql_server_ispconfig_password}', $conf["mysql"]["ispconfig_password"], $content); @@ -841,24 +825,23 @@ class installer_base { //exec('mkdir -p '.$config_dir.'/conf/ChrootEveryone'); exec('echo "yes" > '.$config_dir.'/conf/ChrootEveryone'); exec('echo "yes" > '.$config_dir.'/conf/BrokenClientsCompatibility'); - + if(is_file('/etc/default/pure-ftpd-common')) { replaceLine('/etc/default/pure-ftpd-common','STANDALONE_OR_INETD=inetd','STANDALONE_OR_INETD=standalone',1,0); replaceLine('/etc/default/pure-ftpd-common','VIRTUALCHROOT=false','VIRTUALCHROOT=true',1,0); } - + if(is_file('/etc/inetd.conf')) { replaceLine('/etc/inetd.conf','/usr/sbin/pure-ftpd-wrapper','#ftp stream tcp nowait root /usr/sbin/tcpd /usr/sbin/pure-ftpd-wrapper',0,0); if(is_file('/etc/init.d/openbsd-inetd')) exec('/etc/init.d/openbsd-inetd restart'); } - + if(!is_file('/etc/pure-ftpd/conf/DontResolve')) exec("echo 'yes' > /etc/pure-ftpd/conf/DontResolve"); } - - public function configure_mydns() - { + + public function configure_mydns() { global $conf; - + // configure pam for SMTP authentication agains the ispconfig database $configfile = 'mydns.conf'; if(is_file($conf["mydns"]["config_dir"].'/'.$configfile)) copy($conf["mydns"]["config_dir"].'/'.$configfile,$conf["mydns"]["config_dir"].'/'.$configfile.'~'); @@ -872,35 +855,35 @@ class installer_base { wf($conf["mydns"]["config_dir"].'/'.$configfile,$content); exec('chmod 600 '.$conf["mydns"]["config_dir"].'/'.$configfile); exec('chown root:root '.$conf["mydns"]["config_dir"].'/'.$configfile); - + } - + public function configure_powerdns() { global $conf; - + //* Create the database if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$conf['powerdns']['database'].' DEFAULT CHARACTER SET '.$conf['mysql']['charset'])) { $this->error('Unable to create MySQL database: '.$conf['powerdns']['database'].'.'); } - + //* Create the ISPConfig database user in the local database - $query = "GRANT ALL ON `".$conf['powerdns']['database']."` . * TO '".$conf['mysql']['ispconfig_user']."'@'localhost';"; + $query = "GRANT ALL ON `".$conf['powerdns']['database']."` . * TO '".$conf['mysql']['ispconfig_user']."'@'localhost';"; if(!$this->db->query($query)) { $this->error('Unable to create user for powerdns database Error: '.$this->db->errorMessage); } - + //* Reload database privelages $this->db->query('FLUSH PRIVILEGES;'); - + //* load the powerdns databse dump if($conf['mysql']['admin_password'] == '') { - caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null", - __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql'); + caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null", + __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql'); } else { - caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null", - __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql'); + caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null", + __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql'); } - + //* Create the powerdns config file $configfile = 'pdns.local'; if(is_file($conf["powerdns"]["config_dir"].'/'.$configfile)) copy($conf["powerdns"]["config_dir"].'/'.$configfile,$conf["powerdns"]["config_dir"].'/'.$configfile.'~'); @@ -913,49 +896,48 @@ class installer_base { wf($conf["powerdns"]["config_dir"].'/'.$configfile,$content); exec('chmod 600 '.$conf["powerdns"]["config_dir"].'/'.$configfile); exec('chown root:root '.$conf["powerdns"]["config_dir"].'/'.$configfile); - - + + } - + public function configure_bind() { global $conf; - + //* Nothing to do - + } - - - - public function configure_apache() - { + + + + public function configure_apache() { global $conf; - + //* Create the logging directory for the vhost logfiles exec('mkdir -p /var/log/ispconfig/httpd'); - + if(is_file('/etc/suphp/suphp.conf')) { replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin','x-httpd-suphp=php:/usr/bin/php-cgi',0); //replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0); replaceLine('/etc/suphp/suphp.conf','umask=0077','umask=0022',0); } - + if(is_file('/etc/apache2/sites-enabled/000-default')) { replaceLine('/etc/apache2/sites-available/000-default','NameVirtualHost *','NameVirtualHost *:80',1,0); replaceLine('/etc/apache2/sites-available/000-default','','',1,0); } - + if(is_file('/etc/apache2/ports.conf')) { // add a line "Listen 443" to ports conf if line does not exist replaceLine('/etc/apache2/ports.conf','Listen 443','Listen 443',1); } - - + + //* Copy the ISPConfig configuration include - $vhost_conf_dir = $conf['apache']['vhost_conf_dir']; - $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; - + $vhost_conf_dir = $conf['apache']['vhost_conf_dir']; + $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; + // copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf'); - + $content = rf("tpl/apache_ispconfig.conf.master"); $records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'"); if(is_array($records) && count($records) > 0) { @@ -966,164 +948,161 @@ class installer_base { } $content .= "\n"; wf($vhost_conf_dir.'/ispconfig.conf',$content); - + if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) { exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf"); } - + //* make sure that webalizer finds its config file when it is directly in /etc if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) { exec('mkdir /etc/webalizer'); exec('ln -s /etc/webalizer.conf /etc/webalizer/webalizer.conf'); } - + if(is_file('/etc/webalizer/webalizer.conf')) { // Change webalizer mode to incremental replaceLine('/etc/webalizer/webalizer.conf','#IncrementalName','IncrementalName webalizer.current',0,0); replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental yes',0,0); replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName webalizer.hist',0,0); } - + //* add a sshusers group $command = 'groupadd sshusers'; if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + } - - public function configure_firewall() - { + + public function configure_firewall() { global $conf; - + $dist_init_scripts = $conf['init_scripts']; - + if(is_dir("/etc/Bastille.backup")) caselog("rm -rf /etc/Bastille.backup", __FILE__, __LINE__); if(is_dir("/etc/Bastille")) caselog("mv -f /etc/Bastille /etc/Bastille.backup", __FILE__, __LINE__); - @mkdir("/etc/Bastille", 0700); - if(is_dir("/etc/Bastille.backup/firewall.d")) caselog("cp -pfr /etc/Bastille.backup/firewall.d /etc/Bastille/", __FILE__, __LINE__); - caselog("cp -f tpl/bastille-firewall.cfg.master /etc/Bastille/bastille-firewall.cfg", __FILE__, __LINE__); - caselog("chmod 644 /etc/Bastille/bastille-firewall.cfg", __FILE__, __LINE__); - $content = rf("/etc/Bastille/bastille-firewall.cfg"); - $content = str_replace("{DNS_SERVERS}", "", $content); - - $tcp_public_services = ''; - $udp_public_services = ''; - + @mkdir("/etc/Bastille", 0700); + if(is_dir("/etc/Bastille.backup/firewall.d")) caselog("cp -pfr /etc/Bastille.backup/firewall.d /etc/Bastille/", __FILE__, __LINE__); + caselog("cp -f tpl/bastille-firewall.cfg.master /etc/Bastille/bastille-firewall.cfg", __FILE__, __LINE__); + caselog("chmod 644 /etc/Bastille/bastille-firewall.cfg", __FILE__, __LINE__); + $content = rf("/etc/Bastille/bastille-firewall.cfg"); + $content = str_replace("{DNS_SERVERS}", "", $content); + + $tcp_public_services = ''; + $udp_public_services = ''; + $row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id'])); - - if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){ - $tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"])); - $udp_public_services = trim(str_replace(',',' ',$row["udp_port"])); - } else { - $tcp_public_services = '21 22 25 53 80 110 143 443 3306 8080 10000'; - $udp_public_services = '53'; - } - + + if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != '') { + $tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"])); + $udp_public_services = trim(str_replace(',',' ',$row["udp_port"])); + } else { + $tcp_public_services = '21 22 25 53 80 110 143 443 3306 8080 10000'; + $udp_public_services = '53'; + } + if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) { $tcp_public_services .= ' '.intval($conf['apache']['vhost_port']); if($row["tcp_port"] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id'])); } - - $content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content); - $content = str_replace("{UDP_PUBLIC_SERVICES}", $udp_public_services, $content); - wf("/etc/Bastille/bastille-firewall.cfg", $content); + $content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content); + $content = str_replace("{UDP_PUBLIC_SERVICES}", $udp_public_services, $content); - if(is_file($dist_init_scripts."/bastille-firewall")) caselog("mv -f $dist_init_scripts/bastille-firewall $dist_init_scripts/bastille-firewall.backup", __FILE__, __LINE__); - caselog("cp -f apps/bastille-firewall $dist_init_scripts", __FILE__, __LINE__); - caselog("chmod 700 $dist_init_scripts/bastille-firewall", __FILE__, __LINE__); + wf("/etc/Bastille/bastille-firewall.cfg", $content); - if(is_file("/sbin/bastille-ipchains")) caselog("mv -f /sbin/bastille-ipchains /sbin/bastille-ipchains.backup", __FILE__, __LINE__); - caselog("cp -f apps/bastille-ipchains /sbin", __FILE__, __LINE__); - caselog("chmod 700 /sbin/bastille-ipchains", __FILE__, __LINE__); + if(is_file($dist_init_scripts."/bastille-firewall")) caselog("mv -f $dist_init_scripts/bastille-firewall $dist_init_scripts/bastille-firewall.backup", __FILE__, __LINE__); + caselog("cp -f apps/bastille-firewall $dist_init_scripts", __FILE__, __LINE__); + caselog("chmod 700 $dist_init_scripts/bastille-firewall", __FILE__, __LINE__); + + if(is_file("/sbin/bastille-ipchains")) caselog("mv -f /sbin/bastille-ipchains /sbin/bastille-ipchains.backup", __FILE__, __LINE__); + caselog("cp -f apps/bastille-ipchains /sbin", __FILE__, __LINE__); + caselog("chmod 700 /sbin/bastille-ipchains", __FILE__, __LINE__); + + if(is_file("/sbin/bastille-netfilter")) caselog("mv -f /sbin/bastille-netfilter /sbin/bastille-netfilter.backup", __FILE__, __LINE__); + caselog("cp -f apps/bastille-netfilter /sbin", __FILE__, __LINE__); + caselog("chmod 700 /sbin/bastille-netfilter", __FILE__, __LINE__); - if(is_file("/sbin/bastille-netfilter")) caselog("mv -f /sbin/bastille-netfilter /sbin/bastille-netfilter.backup", __FILE__, __LINE__); - caselog("cp -f apps/bastille-netfilter /sbin", __FILE__, __LINE__); - caselog("chmod 700 /sbin/bastille-netfilter", __FILE__, __LINE__); - if(!@is_dir('/var/lock/subsys')) caselog("mkdir /var/lock/subsys", __FILE__, __LINE__); - exec("which ipchains &> /dev/null", $ipchains_location, $ret_val); - if(!is_file("/sbin/ipchains") && !is_link("/sbin/ipchains") && $ret_val == 0) phpcaselog(@symlink(shell_exec("which ipchains"), "/sbin/ipchains"), 'create symlink', __FILE__, __LINE__); - unset($ipchains_location); - exec("which iptables &> /dev/null", $iptables_location, $ret_val); - if(!is_file("/sbin/iptables") && !is_link("/sbin/iptables") && $ret_val == 0) phpcaselog(@symlink(trim(shell_exec("which iptables")), "/sbin/iptables"), 'create symlink', __FILE__, __LINE__); - unset($iptables_location); + exec("which ipchains &> /dev/null", $ipchains_location, $ret_val); + if(!is_file("/sbin/ipchains") && !is_link("/sbin/ipchains") && $ret_val == 0) phpcaselog(@symlink(shell_exec("which ipchains"), "/sbin/ipchains"), 'create symlink', __FILE__, __LINE__); + unset($ipchains_location); + exec("which iptables &> /dev/null", $iptables_location, $ret_val); + if(!is_file("/sbin/iptables") && !is_link("/sbin/iptables") && $ret_val == 0) phpcaselog(@symlink(trim(shell_exec("which iptables")), "/sbin/iptables"), 'create symlink', __FILE__, __LINE__); + unset($iptables_location); } - - public function configure_vlogger() - { - global $conf; - - //** Configure vlogger to use traffic logging to mysql (master) db - $configfile = 'vlogger-dbi.conf'; - if(is_file($conf["vlogger"]["config_dir"].'/'.$configfile)) copy($conf["vlogger"]["config_dir"].'/'.$configfile,$conf["vlogger"]["config_dir"].'/'.$configfile.'~'); - if(is_file($conf["vlogger"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["vlogger"]["config_dir"].'/'.$configfile.'~'); - $content = rf("tpl/".$configfile.".master"); - if($conf['mysql']['master_slave_setup'] == 'y') { - $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['master_ispconfig_user'],$content); - $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['master_ispconfig_password'], $content); - $content = str_replace('{mysql_server_database}',$conf['mysql']['master_database'],$content); - $content = str_replace('{mysql_server_ip}',$conf["mysql"]["master_host"],$content); - } else { - $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); - $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); - $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); - $content = str_replace('{mysql_server_ip}',$conf["mysql"]["host"],$content); - } - wf($conf["vlogger"]["config_dir"].'/'.$configfile,$content); - exec('chmod 600 '.$conf["vlogger"]["config_dir"].'/'.$configfile); - exec('chown root:root '.$conf["vlogger"]["config_dir"].'/'.$configfile); - - } - - public function configure_apps_vhost() - { + + public function configure_vlogger() { global $conf; - + + //** Configure vlogger to use traffic logging to mysql (master) db + $configfile = 'vlogger-dbi.conf'; + if(is_file($conf["vlogger"]["config_dir"].'/'.$configfile)) copy($conf["vlogger"]["config_dir"].'/'.$configfile,$conf["vlogger"]["config_dir"].'/'.$configfile.'~'); + if(is_file($conf["vlogger"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["vlogger"]["config_dir"].'/'.$configfile.'~'); + $content = rf("tpl/".$configfile.".master"); + if($conf['mysql']['master_slave_setup'] == 'y') { + $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['master_ispconfig_user'],$content); + $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['master_ispconfig_password'], $content); + $content = str_replace('{mysql_server_database}',$conf['mysql']['master_database'],$content); + $content = str_replace('{mysql_server_ip}',$conf["mysql"]["master_host"],$content); + } else { + $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); + $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); + $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); + $content = str_replace('{mysql_server_ip}',$conf["mysql"]["host"],$content); + } + wf($conf["vlogger"]["config_dir"].'/'.$configfile,$content); + exec('chmod 600 '.$conf["vlogger"]["config_dir"].'/'.$configfile); + exec('chown root:root '.$conf["vlogger"]["config_dir"].'/'.$configfile); + + } + + public function configure_apps_vhost() { + global $conf; + //* Create the ispconfig apps vhost user and group - + $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']); $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']); $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps'); - + $command = 'groupadd '.$apps_vhost_user; if(!is_group($apps_vhost_group)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + $command = "useradd -g '$apps_vhost_group' -d $install_dir $apps_vhost_group"; if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + $command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + exec('mkdir -p '.$install_dir); exec("chown $apps_vhost_user:$apps_vhost_group $install_dir"); - + //* Copy the apps vhost file - $vhost_conf_dir = $conf['apache']['vhost_conf_dir']; - $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; - $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername']; - - // Dont just copy over the virtualhost template but add some custom settings - $content = rf("tpl/apache_apps.vhost.master"); - + $vhost_conf_dir = $conf['apache']['vhost_conf_dir']; + $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; + $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'':'ServerName '.$conf['web']['apps_vhost_servername']; + + // Dont just copy over the virtualhost template but add some custom settings + $content = rf("tpl/apache_apps.vhost.master"); + $content = str_replace('{apps_vhost_ip}', $conf['web']['apps_vhost_ip'], $content); $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content); $content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content); $content = str_replace('{website_basedir}', $conf['web']['website_basedir'], $content); $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content); - - + + // comment out the listen directive if port is 80 or 443 if($conf['web']['apps_vhost_ip'] == 80 or $conf['web']['apps_vhost_ip'] == 443) { $content = str_replace('{vhost_port_listen}', '#', $content); } else { $content = str_replace('{vhost_port_listen}', '', $content); } - + wf("$vhost_conf_dir/apps.vhost", $content); - + //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost"); //* and create the symlink if($this->install_ispconfig_interface == true) { @@ -1137,15 +1116,14 @@ class installer_base { exec('cp tpl/apache_apps_fcgi_starter.master '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter'); exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps'); - + } - + } - - public function install_ispconfig() - { + + public function install_ispconfig() { global $conf; - + $install_dir = $conf['ispconfig_install_dir']; //* Create the ISPConfig installation directory @@ -1153,75 +1131,78 @@ class installer_base { $command = "mkdir $install_dir"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } - + //* Create a ISPConfig user and group $command = 'groupadd ispconfig'; if(!is_group('ispconfig')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + $command = "useradd -g ispconfig -d $install_dir ispconfig"; if(!is_user('ispconfig')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + //* copy the ISPConfig interface part $command = "cp -rf ../interface $install_dir"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + //* copy the ISPConfig server part $command = "cp -rf ../server $install_dir"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + //* Create a symlink, so ISPConfig is accessible via web // Replaced by a separate vhost definition for port 8080 // $command = "ln -s $install_dir/interface/web/ /var/www/ispconfig"; // caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + //* Create the config file for ISPConfig interface $configfile = 'config.inc.php'; - if(is_file($install_dir.'/interface/lib/'.$configfile)){ - copy("$install_dir/interface/lib/$configfile", "$install_dir/interface/lib/$configfile~"); - } + if(is_file($install_dir.'/interface/lib/'.$configfile)) { + copy("$install_dir/interface/lib/$configfile", "$install_dir/interface/lib/$configfile~"); + } $content = rf("tpl/$configfile.master"); $content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content); $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content); $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content); - + $content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content); $content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content); $content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content); $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content); - + $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); - + wf("$install_dir/interface/lib/$configfile", $content); - + //* Create the config file for ISPConfig server $configfile = 'config.inc.php'; - if(is_file($install_dir.'/server/lib/'.$configfile)){ - copy("$install_dir/server/lib/$configfile", "$install_dir/interface/lib/$configfile~"); - } + if(is_file($install_dir.'/server/lib/'.$configfile)) { + copy("$install_dir/server/lib/$configfile", "$install_dir/interface/lib/$configfile~"); + } $content = rf("tpl/$configfile.master"); $content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content); $content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content); $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content); $content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content); - + $content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content); $content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content); $content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content); $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content); - + $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); - + wf("$install_dir/server/lib/$configfile", $content); - //* Create the config file for remote-actions - $content = ""; - wf("$install_dir/server/lib/remote_actions.inc.php", $content); - + //* Create the config file for remote-actions (but only, if it does not exist, because + // the value is a autoinc-value and so changed by the remoteaction_core_module + if (!file_exists("$install_dir/server/lib/remote_action.inc.php")) { + $content = '"; + wf("$install_dir/server/lib/remote_action.inc.php", $content); + } + //* Enable the server modules and plugins. // TODO: Implement a selector which modules and plugins shall be enabled. $dir = $install_dir.'/server/mods-available/'; @@ -1244,7 +1225,7 @@ class installer_base { closedir($dh); } } - + $dir = $install_dir.'/server/plugins-available/'; if (is_dir($dir)) { if ($dh = opendir($dir)) { @@ -1265,7 +1246,7 @@ class installer_base { closedir($dh); } } - + // Update the server config $mail_server_enabled = ($conf['services']['mail'])?1:0; $web_server_enabled = ($conf['services']['web'])?1:0; @@ -1273,22 +1254,22 @@ class installer_base { $file_server_enabled = ($conf['services']['file'])?1:0; $db_server_enabled = ($conf['services']['db'])?1:0; $vserver_server_enabled = ($conf['services']['vserver'])?1:0; - - - - - - + + + + + + $sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']); - + if($conf['mysql']['master_slave_setup'] == 'y') { $this->dbmaster->query($sql); $this->db->query($sql); } else { $this->db->query($sql); } - - + + //* Chmod the files $command = "chmod -R 750 $install_dir"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); @@ -1296,18 +1277,18 @@ class installer_base { //* chown the files to the ispconfig user and group $command = "chown -R ispconfig:ispconfig $install_dir"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + //* Make the global language file directory group writable exec("chmod -R 770 $install_dir/interface/lib/lang"); - + //* Make the temp directory for language file exports writable if(is_dir("$install_dir/interface/web/temp")) exec("chmod -R 770 $install_dir/interface/web/temp"); - + //* Make all interface language file directories group writable $handle = @opendir($install_dir.'/interface/web'); - while ($file = @readdir ($handle)) { - if ($file != '.' && $file != '..') { - if(@is_dir($install_dir.'/interface/web'.'/'.$file.'/lib/lang')) { + while ($file = @readdir ($handle)) { + if ($file != '.' && $file != '..') { + if(@is_dir($install_dir.'/interface/web'.'/'.$file.'/lib/lang')) { $handle2 = opendir($install_dir.'/interface/web'.'/'.$file.'/lib/lang'); chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang',0770); while ($lang_file = @readdir ($handle2)) { @@ -1318,47 +1299,47 @@ class installer_base { } } } - + //* make sure that the server config file (not the interface one) is only readable by the root user exec("chmod 600 $install_dir/server/lib/$configfile"); exec("chown root:root $install_dir/server/lib/$configfile"); - exec("chmod 600 $install_dir/server/lib/remote_actions.inc.php"); - exec("chown root:root $install_dir/server/lib/remote_actions.inc.php"); + exec("chmod 600 $install_dir/server/lib/remote_action.inc.php"); + exec("chown root:root $install_dir/server/lib/remote_action.inc.php"); if(@is_file("$install_dir/server/lib/mysql_clientdb.conf")) { exec("chmod 600 $install_dir/server/lib/mysql_clientdb.conf"); exec("chown root:root $install_dir/server/lib/mysql_clientdb.conf"); } - + // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // and must be fixed as this will allow the apache user to read the ispconfig files. // Later this must run as own apache server or via suexec! $command = 'adduser www-data ispconfig'; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + //* Make the shell scripts executable $command = "chmod +x $install_dir/server/scripts/*.sh"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - + //* Copy the ISPConfig vhost for the controlpanel - $vhost_conf_dir = $conf['apache']['vhost_conf_dir']; - $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; - - - // Dont just copy over the virtualhost template but add some custom settings - $content = rf("tpl/apache_ispconfig.vhost.master"); + $vhost_conf_dir = $conf['apache']['vhost_conf_dir']; + $vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir']; + + + // Dont just copy over the virtualhost template but add some custom settings + $content = rf("tpl/apache_ispconfig.vhost.master"); $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content); - + // comment out the listen directive if port is 80 or 443 if($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 443) { $content = str_replace('{vhost_port_listen}', '#', $content); } else { $content = str_replace('{vhost_port_listen}', '', $content); } - + wf("$vhost_conf_dir/ispconfig.vhost", $content); - + //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost"); //* and create the symlink if($this->install_ispconfig_interface == true && $this->is_update == false) { @@ -1373,9 +1354,9 @@ class installer_base { exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter'); exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig'); exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig'); - + } - + //* Install the update script if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh'); exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh'); @@ -1386,7 +1367,7 @@ class installer_base { exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh'); if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh'); if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh'); - + //* Make the logs readable for the ispconfig user if(@is_file('/var/log/mail.log')) exec('chmod +r /var/log/mail.log'); if(@is_file('/var/log/mail.warn')) exec('chmod +r /var/log/mail.warn'); @@ -1394,17 +1375,17 @@ class installer_base { if(@is_file('/var/log/messages')) exec('chmod +r /var/log/messages'); if(@is_file('/var/log/clamav/clamav.log')) exec('chmod +r /var/log/clamav/clamav.log'); if(@is_file('/var/log/clamav/freshclam.log')) exec('chmod +r /var/log/clamav/freshclam.log'); - + //* Create the ispconfig log directory if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig'); if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log'); - + exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh'); if(is_user('getmail')) exec('chown getmail /usr/local/bin/run-getmail.sh'); exec('chmod 744 /usr/local/bin/run-getmail.sh'); //* Add Log-Rotation - if (is_dir('/etc/logrotate.d')){ + if (is_dir('/etc/logrotate.d')) { unlink('/etc/logrotate.d/logispc3'); $fh = fopen('/etc/logrotate.d/logispc3', 'w'); fwrite($fh, @@ -1425,47 +1406,45 @@ class installer_base { fclose($fh); } } - - public function configure_dbserver() - { + + public function configure_dbserver() { global $conf; - + //* If this server shall act as database server for client DB's, we configure this here $install_dir = $conf['ispconfig_install_dir']; - - // Create a file with the database login details which + + // Create a file with the database login details which // are used to create the client databases. - + if(!is_dir("$install_dir/server/lib")) { $command = "mkdir $install_dir/server/lib"; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } - + $content = rf("tpl/mysql_clientdb.conf.master"); $content = str_replace('{username}',$conf['mysql']['admin_user'],$content); $content = str_replace('{password}',$conf['mysql']['admin_password'], $content); wf("$install_dir/server/lib/mysql_clientdb.conf",$content); exec('chmod 600 '."$install_dir/server/lib/mysql_clientdb.conf"); exec('chown root:root '."$install_dir/server/lib/mysql_clientdb.conf"); - + } - - public function install_crontab() - { + + public function install_crontab() { global $conf; - + //* Root Crontab exec('crontab -u root -l > crontab.txt'); $existing_root_cron_jobs = file('crontab.txt'); - + // remove existing ispconfig cronjobs, in case the syntax has changed foreach($existing_root_cron_jobs as $key => $val) { if(stristr($val,'/usr/local/ispconfig')) unset($existing_root_cron_jobs[$key]); } - + $root_cron_jobs = array( - '* * * * * /usr/local/ispconfig/server/server.sh > /dev/null 2>> /var/log/ispconfig/cron.log', - '30 00 * * * /usr/local/ispconfig/server/cron_daily.sh > /dev/null 2>> /var/log/ispconfig/cron.log' + '* * * * * /usr/local/ispconfig/server/server.sh > /dev/null 2>> /var/log/ispconfig/cron.log', + '30 00 * * * /usr/local/ispconfig/server/cron_daily.sh > /dev/null 2>> /var/log/ispconfig/cron.log' ); foreach($root_cron_jobs as $cron_job) { if(!in_array($cron_job."\n", $existing_root_cron_jobs)) { @@ -1475,22 +1454,22 @@ class installer_base { file_put_contents('crontab.txt', $existing_root_cron_jobs); exec('crontab -u root crontab.txt &> /dev/null'); unlink('crontab.txt'); - + //* Getmail crontab if(is_user('getmail')) { - $cf = $conf['getmail']; + $cf = $conf['getmail']; exec('crontab -u getmail -l > crontab.txt'); $existing_cron_jobs = file('crontab.txt'); - + $cron_jobs = array( - '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log' - ); - + '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log' + ); + // remove existing ispconfig cronjobs, in case the syntax has changed foreach($existing_cron_jobs as $key => $val) { if(stristr($val,'getmail')) unset($existing_cron_jobs[$key]); } - + foreach($cron_jobs as $cron_job) { if(!in_array($cron_job."\n", $existing_cron_jobs)) { $existing_cron_jobs[] = $cron_job."\n"; @@ -1500,12 +1479,12 @@ class installer_base { exec('crontab -u getmail crontab.txt &> /dev/null'); unlink('crontab.txt'); } - + exec('touch /var/log/ispconfig/cron.log'); exec('chmod 666 /var/log/ispconfig/cron.log'); - + } - + /** * Helper function - get the path to a template file based on * the local part of the filename. Checks first for the existence @@ -1515,16 +1494,15 @@ class installer_base { * of the template file and return it instead of the path. The 3rd * parameter further extends this behaviour by filtering the contents * by inserting the ispconfig database credentials using the {} placeholders. - * + * * @param string $tLocal local part of filename * @param bool $tRf * @param bool $tDBCred * @return string Relative path to the chosen template file */ - protected function get_template_file($tLocal, $tRf=false, $tDBCred=false) - { + protected function get_template_file($tLocal, $tRf=false, $tDBCred=false) { global $conf, $dist; - + $final_path = ''; $dist_template = 'dist/tpl/'.strtolower($dist['name'])."/$tLocal.master"; if (file_exists($dist_template)) { @@ -1532,14 +1510,14 @@ class installer_base { } else { $final_path = "tpl/$tLocal.master"; } - + if (!$tRf) { return $final_path; } else { return (!$tDBCred) ? rf($final_path) : $this->insert_db_credentials(rf($final_path)); } } - + /** * Helper function - writes the contents to a config file * and performs a backup if the file exist. Additionally @@ -1547,34 +1525,32 @@ class installer_base { * same rights and ownership as the original. Optionally the * rights and/or ownership can be overriden by appending umask, * user and group to the parameters. Providing only uid and gid - * values will result in only a chown. - * + * values will result in only a chown. + * * @param $tConf * @param $tContents * @return bool */ - protected function write_config_file($tConf, $tContents) - { + protected function write_config_file($tConf, $tContents) { // Backup config file before writing new contents and stat file - if ( is_file($tConf) ) - { + if ( is_file($tConf) ) { $stat = exec('stat -c \'%a %U %G\' '.escapeshellarg($tConf), $output, $res); if ($res == 0) { // stat successfull list($access, $user, $group) = split(" ", $stat); } - + if ( copy($tConf, $tConf.'~') ) { exec('chmod 400 '.$tConf.'~'); } } - + wf($tConf, $tContents); // write file - + if (func_num_args() >= 4) // override rights and/or ownership { $args = func_get_args(); $output = array_slice($args, 2); - + switch (sizeof($output)) { case 3: $umask = array_shift($output); @@ -1588,35 +1564,34 @@ class installer_base { break; } } - + if (!empty($user) && !empty($group)) { exec("chown $user:$group $tConf"); } - + if (!empty($access)) { exec("chmod $access $tConf"); } } - + /** * Helper function - filter the contents of a config * file by inserting the common ispconfig database * credentials. - * + * * @param $tContents * @return string */ - protected function insert_db_credentials($tContents) - { + protected function insert_db_credentials($tContents) { global $conf; - + $tContents = str_replace('{mysql_server_ispconfig_user}', $conf["mysql"]["ispconfig_user"], $tContents); $tContents = str_replace('{mysql_server_ispconfig_password}', $conf["mysql"]["ispconfig_password"], $tContents); $tContents = str_replace('{mysql_server_database}', $conf["mysql"]["database"], $tContents); $tContents = str_replace('{mysql_server_ip}', $conf["mysql"]["ip"], $tContents); $tContents = str_replace('{mysql_server_host}',$conf['mysql']['host'], $tContents); $tContents = str_replace('{mysql_server_port}',$conf["mysql"]["port"], $tContents); - + return $tContents; } } diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index e9db32e56d98362ccc816d944ae8b00bdca0fe7e..07919e3f78adbc6168d19eb3650332f99dff08ba 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1159,9 +1159,10 @@ CREATE TABLE `sys_remoteaction` ( `tstamp` int(11) NOT NULL, `action_type` varchar(20) NOT NULL, `action_param` mediumtext NOT NULL, - `action_status` enum('pending','ok','warning','error') NOT NULL, + `action_state` enum('pending','ok','warning','error') NOT NULL, `response` mediumtext NOT NULL, - PRIMARY KEY (`action_id`) + PRIMARY KEY (`action_id`), + KEY `server_id` (`server_id`) ) ENGINE=MyISAM; -- -------------------------------------------------------- diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php new file mode 100644 index 0000000000000000000000000000000000000000..7e8c0b1e005316e6fc5922032f8137bc569e3889 --- /dev/null +++ b/server/mods-available/remoteaction_core_module.inc.php @@ -0,0 +1,138 @@ +_execActions(); + } + + /* + This function is called when a change in one of the registered tables is detected. + The function then raises the events for the plugins. + */ + function process($tablename, $action, $data) { + // not needed + } // end function + + private function _actionDone($id, $state) { + /* + * First set the state + */ + global $app; + $sql = "UPDATE sys_remoteaction " . + "SET action_state = '" . $app->dbmaster->quote($state) . "' " . + "WHERE action_id = " . intval($id); + $app->dbmaster->query($sql); + + /* + * Then save the maxid for the next time... + */ + $fp = fopen(dirname(__FILE__) . "/../lib/remote_action.inc.php", 'wb'); + $content = '"; + fwrite($fp, $content); + fclose($fp); + } + + + /** + * This method searches for scheduled actions and exec then + */ + private function _execActions() { + global $app; + global $conf; + + /* the id of the server as int */ + $server_id = intval($conf["server_id"]); + + /* + * First we (till and i, oliver) thought, it was enough to write + * "select from where action_status = 'pending'" and then execute this actions. + * But it is not! + * If a hacker can hack into a server, she can change the valus of action_status + * and so re-exec a action, executed some days bevore. So she can (for example) + * stop a service, a admin stopped some days before! To avoid this, we ignore + * the status (it is only for the interface to show) and use our own maxid + */ + include_once (dirname(__FILE__) . "/../lib/remote_action.inc.php"); + + /* + * Get all actions this server should execute + */ + $sql = "SELECT action_id, action_type, action_param " . + "FROM sys_remoteaction " . + "WHERE server_id = " . $server_id . " ". + " AND action_id > " . intval($maxid_remote_action) . " ". + "ORDER BY action_id"; + $actions = $app->dbmaster->queryAllRecords($sql); + + /* + * process all actions + */ + foreach ($actions as $action) { + if ($action['action_type'] == 'os_update') { + /* do the update */ + $this->_doOsUpdate($action); + /* this action takes so much time, + * we stop executing the actions not to waste more time */ + return; + } + } + } + + private function _doOsUpdate($action) { + /* + * Do the update + */ + exec("aptitude update"); + exec("aptitude upgrade -y"); + + /* + * All well done! + */ + $this->_actionDone($action['action_id'], 'ok'); + } + +} +?> \ No newline at end of file