From a75d10d7548e69fb6fd3b9dcf14d357febcc72f4 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Tue, 21 Aug 2007 19:32:35 -0400
Subject: [PATCH] Removed globals and created private vars
---
install/lib/installer_base.lib.php | 367 ++++++++++++++++++++++++++-------------------------
1 files changed, 188 insertions(+), 179 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 9e3460d..209e319 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -34,9 +34,8 @@
var $language = 'en';
var $db;
private $conf;
- /*
-
- */
+
+
public function __construct()
{
global $conf; //TODO: maybe $conf should be passed to constructor
@@ -113,7 +112,6 @@
} while (!$this->check_break($lang) or $this->
*/
-
}
/** Create the database for ISPConfig */
@@ -159,10 +157,8 @@
}
}
- /*
- Create postfix configuration files
- */
+ //** writes postfix configuration files
private function process_postfix_config($configfile)
{
$config_dir = $this->conf['dist']['postfix']['config_dir'].'/';
@@ -180,7 +176,7 @@
wf($full_file_name, $content);
}
-
+
public function configure_postfix($options = '')
{
$cf = $this->conf['dist']['postfix'];
@@ -344,10 +340,10 @@
if(is_file($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf')) copy($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf',$conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~');
if(is_file($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~')) exec('chmod 400 '.$conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf~');
$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('{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);
wf($conf["dist"]["postfix"]["config_dir"].'/sasl/smtpd.conf',$content);
// TODO: Chmod and chown on the config file
@@ -375,50 +371,55 @@
}
- function configure_pam() {
- global $conf;
-
- // configure pam for SMTP authentication agains the ispconfig database
+ public function configure_pam()
+ {
+ $pam = $this->conf['dist']['pam'];
+ //* configure pam for SMTP authentication agains the ispconfig database
$configfile = 'pamd_smtp';
- if(is_file($conf['dist']['pam'].'/smtp')) copy($conf['dist']['pam'].'/smtp',$conf['dist']['pam'].'/smtp~');
- if(is_file($conf['dist']['pam'].'/smtp~')) exec('chmod 400 '.$conf['dist']['pam'].'/smtp~');
- $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);
- wf($conf['dist']['pam'].'/smtp',$content);
- exec('chmod 660 '.$conf['dist']['pam'].'/smtp');
- exec('chown daemon:daemon '.$conf['dist']['pam'].'/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);
+ wf("$pam/smtp", $content);
+ exec("chmod 660 $pam/smtp");
+ exec("chown daemon:daemon $pam/smtp");
}
- function configure_courier() {
- global $conf;
-
- // authmysqlrc
+ public function configure_courier()
+ {
+ $config_dir = $this->conf['dist']['courier']['config_dir'];
+ //* authmysqlrc
$configfile = 'authmysqlrc';
- if(is_file($conf["dist"]["courier"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["courier"]["config_dir"].'/'.$configfile,$conf["dist"]["courier"]["config_dir"].'/'.$configfile.'~');
- exec('chmod 400 '.$conf["dist"]["courier"]["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_host}',$conf["mysql"]["host"],$content);
- wf($conf["dist"]["courier"]["config_dir"].'/'.$configfile,$content);
+ 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}',$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);
+ wf("$config_dir/$configfile", $content);
- exec('chmod 660 '.$conf["dist"]["courier"]["config_dir"].'/'.$configfile);
- exec('chown daemon:daemon '.$conf["dist"]["courier"]["config_dir"].'/'.$configfile);
+ exec("chmod 660 $config_dir/$configfile");
+ exec("chown daemon:daemon $config_dir/$configfile");
- //authdaemonrc
- $configfile = $conf["dist"]["courier"]["config_dir"].'/authdaemonrc';
- if(is_file($configfile)) copy($configfile,$configfile.'~');
- if(is_file($configfile.'~')) exec('chmod 400 '.$configfile.'~');
+ //* authdaemonrc
+ $configfile = $this->conf['dist']['courier']['config_dir'].'/authdaemonrc';
+ 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);
-
-
+ $content = str_replace('authmodulelist="authpam"', 'authmodulelist="authmysql"', $content);
+ wf($configfile, $content);
}
function configure_amavis() {
@@ -429,11 +430,11 @@
if(is_file($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user',$conf["dist"]["courier"]["config_dir"].'/50-user~');
if(is_file($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user~');
$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_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_port}',$conf["mysql"]["port"],$content);
- $content = str_replace('{mysql_server_ip}',$conf["mysql"]["ip"],$content);
+ $content = str_replace('{mysql_server_ip}',$this->conf['mysql']['ip'],$content);
wf($conf["dist"]["amavis"]["config_dir"].'/conf.d/50-user',$content);
// TODO: chmod and chown on the config file
@@ -451,7 +452,7 @@
// 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);
+ caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
// Append the configuration for amavisd to the master.cf file
@@ -470,53 +471,59 @@
public function configure_spamassassin()
{
- //* Enable spamasasssin in debian and ubuntu
+ //* Enable spamasasssin on debian and ubuntu
$configfile = '/etc/default/spamassassin';
if(is_file($configfile)){
- copy($configfile,$configfile.'~');
+ copy($configfile, $configfile.'~');
}
$content = rf($configfile);
$content = str_replace('ENABLED=0', 'ENABLED=1', $content);
wf($configfile, $content);
}
- function configure_getmail() {
- global $conf;
+ public function configure_getmail()
+ {
+ $config_dir = $this->conf['dist']['getmail']['config_dir'];
+
+ $command = "useradd -d $config_dir getmail";
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- $command = 'useradd -d '.$conf["dist"]["getmail"]["config_dir"].' 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 = 'chown -R getmail '.$conf["dist"]["getmail"]["config_dir"];
- caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-
- $command = 'chmod -R 700 '.$conf["dist"]["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");
}
- function configure_pureftpd() {
- global $conf;
-
- // configure pam for SMTP authentication agains the ispconfig database
+ public function configure_pureftpd()
+ {
+ $config_dir = $this->conf['dist']['pureftpd']['config_dir'];
+
+ //* configure pam for SMTP authentication agains the ispconfig database
$configfile = 'db/mysql.conf';
- if(is_file($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile,$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~');
- if(is_file($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist"]["pureftpd"]["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);
- $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($conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile,$content);
- exec('chmod 600 '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile);
- exec('chown root:root '.$conf["dist"]["pureftpd"]["config_dir"].'/'.$configfile);
- // enable chrooting
- exec('mkdir -p '.$conf["dist"]["pureftpd"]["config_dir"].'/conf/ChrootEveryone');
- exec('echo "yes" > '.$conf["dist"]["pureftpd"]["config_dir"].'/conf/ChrootEveryone');
-
+ 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}', $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);
+ wf("$config_dir/$configfile", $content);
+ exec("chmod 600 $config_dir/$configfile");
+ exec("chown root:root $config_dir/$configfile");
+ // **enable chrooting
+ exec('mkdir -p '.$config_dir.'/conf/ChrootEveryone');
+ exec('echo "yes" > '.$config_dir.'/conf/ChrootEveryone');
}
- function configure_mydns() {
+ public function configure_mydns()
+ {
global $conf;
// configure pam for SMTP authentication agains the ispconfig database
@@ -524,9 +531,9 @@
if(is_file($conf["dist"]["mydns"]["config_dir"].'/'.$configfile)) copy($conf["dist"]["mydns"]["config_dir"].'/'.$configfile,$conf["dist"]["mydns"]["config_dir"].'/'.$configfile.'~');
if(is_file($conf["dist"]["mydns"]["config_dir"].'/'.$configfile.'~')) exec('chmod 400 '.$conf["dist"]["mydns"]["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_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}',$conf["mysql"]["host"],$content);
$content = str_replace('{server_id}',$conf["server_id"],$content);
wf($conf["dist"]["mydns"]["config_dir"].'/'.$configfile,$content);
@@ -535,130 +542,132 @@
}
- function configure_apache() {
- global $conf;
-
- // Create the logging directory for the vhost logfiles
- exec("mkdir -p /var/log/ispconfig/httpd");
+ public function configure_apache()
+ {
+ //* Create the logging directory for the vhost logfiles
+ exec('mkdir -p /var/log/ispconfig/httpd');
}
- function install_ispconfig() {
- global $conf;
-
- // Create the ISPConfig installation directory
- $command = "mkdir ".$conf["ispconfig_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);
-
- $command = "useradd -g ispconfig -d ".$conf["ispconfig_install_dir"]." ispconfig";
- caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
-
- // copy the ISPConfig interface part
- $command = "cp -rf ../interface ".$conf["ispconfig_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 ".$conf["ispconfig_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
- $command = "ln -s ".$conf["ispconfig_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($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile)) copy($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile,$conf["ispconfig_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);
- wf($conf["ispconfig_install_dir"].'/interface/lib/'.$configfile,$content);
-
- // Create the config file for ISPConfig server
- $configfile = 'config.inc.php';
- if(is_file($conf["ispconfig_install_dir"].'/server/lib/'.$configfile)) copy($conf["ispconfig_install_dir"].'/server/lib/'.$configfile,$conf["ispconfig_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('{server_id}',$conf["server_id"],$content);
- wf($conf["ispconfig_install_dir"].'/server/lib/'.$configfile,$content);
-
-
- // Chmod the files
- $command = "chmod -R 750 ".$conf["ispconfig_install_dir"];
- caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+ public function install_ispconfig()
+ {
+ $install_dir = $this->conf['ispconfig_install_dir'];
- // chown the files to the ispconfig user and group
- $command = "chown -R ispconfig:ispconfig ".$conf["ispconfig_install_dir"];
- caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+ //* Create the ISPConfig installation directory
+ $command = "mkdir $install_dir";
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- // make sure that the server config file (not the interface one) is only readable by the root user
- exec('chmod 600 '.$conf["ispconfig_install_dir"].'/server/lib/'.$configfile);
- exec('chown root:root '.$conf["ispconfig_install_dir"].'/server/lib/'.$configfile);
+ //* Create a ISPConfig user and group
+ $command = 'groupadd ispconfig';
+ caselog($command.' &> /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");
+
+ //* 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
+ $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~");
+ }
+ $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);
+ 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~");
+ }
+ $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);
+ wf("$install_dir/server/lib/$configfile", $content);
+
+
+ //* Chmod the files
+ $command = "chmod -R 750 $install_dir";
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+
+ //* 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 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");
// 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");
- $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");
- // Make the shell scripts executable
- $command = "chmod +x ".$conf["ispconfig_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
- copy('tpl/apache_ispconfig.vhost.master',$conf["dist"]["apache"]["vhost_conf_dir"].'/ispconfig.vhost');
- // and create the symlink
- if(!is_link($conf["dist"]["apache"]["vhost_conf_enabled_dir"].'/ispconfig.vhost')) {
- exec('ln -s '.$conf["dist"]["apache"]["vhost_conf_dir"].'/ispconfig.vhost '.$conf["dist"]["apache"]["vhost_conf_enabled_dir"].'/ispconfig.vhost');
+ //* Copy the ISPConfig vhost for the controlpanel
+ //TODO These are missing! should they be "vhost_dist_*_dir" ?
+ $vhost_conf_dir = $this->conf['dist']['apache']['vhost_conf_dir'];
+ $vhost_conf_enabled_dir = $this->conf['dist']['apache']['vhost_conf_enabled_dir'];
+ 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");
}
-
}
- function install_crontab() {
- global $conf;
-
- // Root Crontab
- exec("crontab -u root -l > crontab.txt");
+ public function install_crontab()
+ {
+ //* Root Crontab
+ exec('crontab -u root -l > crontab.txt');
$existing_root_cron_jobs = file('crontab.txt');
$root_cron_jobs = array('* * * * * /usr/bin/php -q /usr/local/ispconfig/server/server.php &> /dev/null');
foreach($root_cron_jobs as $cron_job) {
- if(!in_array($cron_job."\n",$existing_root_cron_jobs)) {
+ if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
$existing_root_cron_jobs[] = $cron_job."\n";
}
}
- file_put_contents('crontab.txt',$existing_root_cron_jobs);
- exec("crontab -u root crontab.txt &> /dev/null");
+ file_put_contents('crontab.txt', $existing_root_cron_jobs);
+ exec('crontab -u root crontab.txt &> /dev/null');
unlink('crontab.txt');
- // Getmail crontab
- exec("crontab -u getmail -l > crontab.txt");
+ //* Getmail crontab
+ $cf = $this->conf['dist']['getmail'];
+ exec('crontab -u getmail -l > crontab.txt');
$existing_cron_jobs = file('crontab.txt');
- $cron_jobs = array('*/5 * * * * '.$conf["dist"]["getmail"]["program"].' -g '.$conf["dist"]["getmail"]["config_dir"].' -r '.$conf["dist"]["getmail"]["config_dir"].'/*.conf &> /dev/null');
+ $cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
foreach($cron_jobs as $cron_job) {
- if(!in_array($cron_job."\n",$existing_cron_jobs)) {
+ if(!in_array($cron_job."\n", $existing_cron_jobs)) {
$existing_cron_jobs[] = $cron_job."\n";
}
}
- file_put_contents('crontab.txt',$existing_cron_jobs);
- exec("crontab -u getmail crontab.txt &> /dev/null");
+ file_put_contents('crontab.txt', $existing_cron_jobs);
+ exec('crontab -u getmail crontab.txt &> /dev/null');
unlink('crontab.txt');
-
}
-
-
}
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1