From b5f64f66d067aca300ce9651ded3023c3ffe8705 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 18 Aug 2008 11:36:48 -0400
Subject: [PATCH] Fixed a bug in the installer that caused additional lines to be appended to postfix master.cf on every update.
---
install/lib/installer_base.lib.php | 304 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 226 insertions(+), 78 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index daef564..0dca156 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -34,15 +34,16 @@
var $language = 'en';
var $db;
public $conf;
+ public $install_ispconfig_interface = true;
public function __construct()
{
global $conf; //TODO: maybe $conf should be passed to constructor
- $this->conf = $conf;
+ //$this->conf = $conf;
}
- //: TODO Implement the translation function and langauge files for the installer.
+ //: TODO Implement the translation function and language files for the installer.
public function lng($text)
{
return $text;
@@ -120,17 +121,6 @@
$this->error('Unable to create MySQL database: '.$cf['database'].'.');
}
- //* Create the ISPConfig database user
- $query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$cf['database'].".* "
- ."TO '".$cf['ispconfig_user']."'@'".$cf['host']."' "
- ."IDENTIFIED BY '".$cf['ispconfig_password']."';";
- if(!$this->db->query($query)) {
- $this->error('Unable to create database user: '.$cf['ispconfig_user']);
- }
-
- //* Reload database privelages
- $this->db->query('FLUSH PRIVILEGES;');
-
//* Set the database name in the DB library
$this->db->dbName = $cf['database'];
@@ -153,40 +143,82 @@
}
}
- //** Create a recors in the
+ //** Create the server record in the database
public function add_database_server_record() {
+
+ global $conf;
+ $cf = $conf['mysql']; // make $conf['mysql'] more accessible
+
+ if($cf['host'] == 'localhost') {
+ $from_host = 'localhost';
+ } else {
+ $from_host = $conf['hostname'];
+ }
+
+ //* Create the ISPConfig database user
+ $query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON '.$cf['database'].".* "
+ ."TO '".$cf['ispconfig_user']."'@'".$from_host."' "
+ ."IDENTIFIED BY '".$cf['ispconfig_password']."';";
+ if(!$this->db->query($query)) {
+ $this->error('Unable to create database user: '.$cf['ispconfig_user']);
+ }
+
+ //* Reload database privelages
+ $this->db->query('FLUSH PRIVILEGES;');
+
+ //* Set the database name in the DB library
+ $this->db->dbName = $cf['database'];
$server_ini_content = rf("tpl/server.ini.master");
$server_ini_content = addslashes($server_ini_content);
- $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', 'Server', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
+ $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']."', 1, 1, 1, 1, 1, 1, '$server_ini_content', 0, 1);";
$this->db->query($sql);
- $this->conf['server_id'] = $this->db->insertID();
+ $conf['server_id'] = $this->db->insertID();
+ $conf['server_id'] = $conf['server_id'];
}
//** writes postfix configuration files
private function process_postfix_config($configfile)
{
- $config_dir = $this->conf['postfix']['config_dir'].'/';
+ $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}', $this->conf['mysql']['ispconfig_user'], $content);
- $content = str_replace('{mysql_server_ispconfig_password}', $this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}', $this->conf['mysql']['database'], $content);
- $content = str_replace('{mysql_server_ip}', $this->conf['mysql']['ip'], $content);
- $content = str_replace('{server_id}', $this->conf['server_id'], $content);
+ $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()
+ {
+ $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_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 = '')
{
- $cf = $this->conf['postfix'];
+ global $conf;
+ $cf = $conf['postfix'];
$config_dir = $cf['config_dir'];
if(!is_dir($config_dir)){
@@ -234,8 +266,8 @@
caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
$postconf_commands = array (
- 'myhostname = '.$this->conf['hostname'],
- 'mydestination = '.$this->conf['hostname'].', localhost, localhost.localdomain',
+ 'myhostname = '.$conf['hostname'],
+ 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
'mynetworks = 127.0.0.0/8',
'virtual_alias_domains =',
'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
@@ -351,10 +383,10 @@
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~');
$content = rf("tpl/".$configfile.".master");
- $content = str_replace('{mysql_server_ispconfig_user}',$this->conf['mysql']['ispconfig_user'],$content);
- $content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}',$this->conf['mysql']['database'],$content);
- $content = str_replace('{mysql_server_ip}',$this->conf['mysql']['ip'],$content);
+ $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);
wf($conf["postfix"]["config_dir"].'/sasl/smtpd.conf',$content);
// TODO: Chmod and chown on the config file
@@ -384,17 +416,18 @@
public function configure_pam()
{
- $pam = $this->conf['pam'];
+ global $conf;
+ $pam = $conf['pam'];
//* configure pam for SMTP authentication agains the ispconfig database
$configfile = 'pamd_smtp';
if(is_file("$pam/smtp")) copy("$pam/smtp", "$pam/smtp~");
if(is_file("$pam/smtp~")) exec("chmod 400 $pam/smtp~");
$content = rf("tpl/$configfile.master");
- $content = str_replace('{mysql_server_ispconfig_user}', $this->conf['mysql']['ispconfig_user'], $content);
- $content = str_replace('{mysql_server_ispconfig_password}', $this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}', $this->conf['mysql']['database'], $content);
- $content = str_replace('{mysql_server_ip}', $this->conf['mysql']['ip'], $content);
+ $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);
wf("$pam/smtp", $content);
exec("chmod 660 $pam/smtp");
exec("chown daemon:daemon $pam/smtp");
@@ -403,7 +436,8 @@
public function configure_courier()
{
- $config_dir = $this->conf['courier']['config_dir'];
+ global $conf;
+ $config_dir = $conf['courier']['config_dir'];
//* authmysqlrc
$configfile = 'authmysqlrc';
if(is_file("$config_dir/$configfile")){
@@ -411,17 +445,17 @@
}
exec("chmod 400 $config_dir/$configfile~");
$content = rf("tpl/$configfile.master");
- $content = str_replace('{mysql_server_ispconfig_user}',$this->conf['mysql']['ispconfig_user'],$content);
- $content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}',$this->conf['mysql']['database'],$content);
- $content = str_replace('{mysql_server_host}',$this->conf['mysql']['host'],$content);
+ $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);
wf("$config_dir/$configfile", $content);
exec("chmod 660 $config_dir/$configfile");
exec("chown daemon:daemon $config_dir/$configfile");
//* authdaemonrc
- $configfile = $this->conf['courier']['config_dir'].'/authdaemonrc';
+ $configfile = $conf['courier']['config_dir'].'/authdaemonrc';
if(is_file($configfile)){
copy($configfile, $configfile.'~');
}
@@ -441,11 +475,11 @@
if(is_file($conf["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["amavis"]["config_dir"].'/conf.d/50-user',$conf["courier"]["config_dir"].'/50-user~');
if(is_file($conf["amavis"]["config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/conf.d/50-user~');
$content = rf("tpl/".$configfile.".master");
- $content = str_replace('{mysql_server_ispconfig_user}',$this->conf['mysql']['ispconfig_user'],$content);
- $content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}',$this->conf['mysql']['database'],$content);
+ $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_port}',$conf["mysql"]["port"],$content);
- $content = str_replace('{mysql_server_ip}',$this->conf['mysql']['ip'],$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
@@ -470,7 +504,7 @@
if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf',$conf["postfix"]["config_dir"].'/master.cf~');
$content = rf("tpl/master_cf_amavis.master");
// Only add the content if we had not addded it before
- if(!stristr("127.0.0.1:10025 inet n - - - - smtpd",$content)) {
+ if(!stristr("127.0.0.1:10025",$content)) {
af($conf["postfix"]["config_dir"].'/master.cf',$content);
}
@@ -482,6 +516,8 @@
public function configure_spamassassin()
{
+ global $conf;
+
//* Enable spamasasssin on debian and ubuntu
$configfile = '/etc/default/spamassassin';
if(is_file($configfile)){
@@ -494,7 +530,7 @@
public function configure_getmail()
{
- $config_dir = $this->conf['getmail']['config_dir'];
+ $config_dir = $conf['getmail']['config_dir'];
if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
@@ -511,7 +547,9 @@
public function configure_pureftpd()
{
- $config_dir = $this->conf['pureftpd']['config_dir'];
+ global $conf;
+
+ $config_dir = $conf['pureftpd']['config_dir'];
//* configure pam for SMTP authentication agains the ispconfig database
$configfile = 'db/mysql.conf';
@@ -522,11 +560,11 @@
exec("chmod 400 $config_dir/$configfile~");
}
$content = rf('tpl/pureftpd_mysql.conf.master');
- $content = str_replace('{mysql_server_ispconfig_user}', $this->conf["mysql"]["ispconfig_user"], $content);
- $content = str_replace('{mysql_server_ispconfig_password}', $this->conf["mysql"]["ispconfig_password"], $content);
- $content = str_replace('{mysql_server_database}', $this->conf["mysql"]["database"], $content);
- $content = str_replace('{mysql_server_ip}', $this->conf["mysql"]["ip"], $content);
- $content = str_replace('{server_id}', $this->conf["server_id"], $content);
+ $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("$config_dir/$configfile", $content);
exec("chmod 600 $config_dir/$configfile");
exec("chown root:root $config_dir/$configfile");
@@ -544,9 +582,9 @@
if(is_file($conf["mydns"]["config_dir"].'/'.$configfile)) copy($conf["mydns"]["config_dir"].'/'.$configfile,$conf["mydns"]["config_dir"].'/'.$configfile.'~');
if(is_file($conf["mydns"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["mydns"]["config_dir"].'/'.$configfile.'~');
$content = rf("tpl/".$configfile.".master");
- $content = str_replace('{mysql_server_ispconfig_user}',$this->conf['mysql']['ispconfig_user'],$content);
- $content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}',$this->conf['mysql']['database'],$content);
+ $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('{server_id}',$conf["server_id"],$content);
wf($conf["mydns"]["config_dir"].'/'.$configfile,$content);
@@ -562,21 +600,79 @@
}
+ public function configure_firewall()
+ {
+ global $conf;
+
+ $dist_init_scripts = $conf['init_scripts'];
+
+ if(is_dir("/etc/Bastille")) caselog("mv -f /etc/Bastille /etc/Bastille.backup", __FILE__, __LINE__);
+ @mkdir("/etc/Bastille", octdec($directory_mode));
+ 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 443 8080 10000';
+ $udp_public_services = '53';
+ }
+ $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);
+
+ 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_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);
+
+ }
+
public function install_ispconfig()
{
- $install_dir = $this->conf['ispconfig_install_dir'];
+ global $conf;
+
+ $install_dir = $conf['ispconfig_install_dir'];
//* Create the ISPConfig installation directory
- $command = "mkdir $install_dir";
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ if(!@is_dir("$install_dir")) {
+ $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';
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ if(!is_group('vacp')) 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";
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ if(!is_user('vacp')) 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";
@@ -597,10 +693,11 @@
copy("$install_dir/interface/lib/$configfile", "$install_dir/interface/lib/$configfile~");
}
$content = rf("tpl/$configfile.master");
- $content = str_replace('{mysql_server_ispconfig_user}', $this->conf['mysql']['ispconfig_user'], $content);
- $content = str_replace('{mysql_server_ispconfig_password}',$this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}', $this->conf['mysql']['database'], $content);
- $content = str_replace('{mysql_server_host}', $this->conf['mysql']['host'], $content);
+ $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('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
wf("$install_dir/interface/lib/$configfile", $content);
//* Create the config file for ISPConfig server
@@ -609,11 +706,12 @@
copy("$install_dir/server/lib/$configfile", "$install_dir/interface/lib/$configfile~");
}
$content = rf("tpl/$configfile.master");
- $content = str_replace('{mysql_server_ispconfig_user}', $this->conf['mysql']['ispconfig_user'], $content);
- $content = str_replace('{mysql_server_ispconfig_password}', $this->conf['mysql']['ispconfig_password'], $content);
- $content = str_replace('{mysql_server_database}', $this->conf['mysql']['database'], $content);
- $content = str_replace('{mysql_server_host}', $this->conf['mysql']['host'], $content);
- $content = str_replace('{server_id}', $this->conf['server_id'], $content);
+ $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('{server_id}', $conf['server_id'], $content);
+ $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
wf("$install_dir/server/lib/$configfile", $content);
@@ -624,7 +722,7 @@
if ($dh = opendir($dir)) {
while (($file = readdir($dh)) !== false) {
if($file != '.' && $file != '..') {
- if(!is_link($install_dir.'/server/mods-enabled/'.$file)) symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
+ if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
}
}
closedir($dh);
@@ -636,7 +734,7 @@
if ($dh = opendir($dir)) {
while (($file = readdir($dh)) !== false) {
if($file != '.' && $file != '..') {
- if(!is_link($install_dir.'/server/plugins-enabled/'.$file)) symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
+ if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
}
}
closedir($dh);
@@ -676,6 +774,10 @@
//* 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");
+ 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.
@@ -689,12 +791,22 @@
//* Copy the ISPConfig vhost for the controlpanel
// TODO: These are missing! should they be "vhost_dist_*_dir" ?
- $vhost_conf_dir = $this->conf['apache']['vhost_conf_dir'];
- $vhost_conf_enabled_dir = $this->conf['apache']['vhost_conf_enabled_dir'];
- copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
+ $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);
+ wf("$vhost_conf_dir/ispconfig.vhost", $content);
+
+ //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
- if(!is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
- exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
+ if($this->install_ispconfig_interface == true) {
+ if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
+ exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
+ }
}
// Make the Clamav log files readable by ISPConfig
@@ -706,10 +818,46 @@
exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
exec('chmod 700 /usr/local/bin/ispconfig_update_from_svn.sh');
+ //set the fast cgi starter script to executable
+ exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
+
+ //* 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');
+ if(@is_file('/var/log/mail.err')) exec('chmod +r /var/log/mail.err');
+ if(@is_file('/var/log/messages')) exec('chmod +r /var/log/messages');
+
+
+ }
+
+ 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
+ // 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()
{
+ global $conf;
+
//* Root Crontab
exec('crontab -u root -l > crontab.txt');
$existing_root_cron_jobs = file('crontab.txt');
@@ -728,7 +876,7 @@
unlink('crontab.txt');
//* Getmail crontab
- $cf = $this->conf['getmail'];
+ $cf = $conf['getmail'];
exec('crontab -u getmail -l > crontab.txt');
$existing_cron_jobs = file('crontab.txt');
--
Gitblit v1.9.1