- Enabled tools module for administrator by default. - Updated Ubuntu insta...

tbrehm

2008-08-02 d75f0807d3d054fba633ffef4e4785900d05de6e

 install/lib/installer_base.lib.php

@@ -601,11 +601,11 @@
      
      $dist_init_scripts = $conf['init_scripts'];
        
      if(is_dir("/etc/Bastille")) caselog("mv -f /etc/Bastille /etc/Bastille.backup", $FILE, __LINE__);
      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__);
        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);

@@ -626,23 +626,25 @@

        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_".date("m_d_Y__H_i_s", $current_date), $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($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-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__);
        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__);
        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);

   }
@@ -655,8 +657,10 @@
      $install_dir = $this->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';
@@ -688,6 +692,7 @@
      $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
@@ -701,6 +706,7 @@
      $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);
      
      
@@ -793,7 +799,7 @@
      //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
      //* and create the symlink
      if($this->install_ispconfig_interface == true) {
         if(!is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
         if(!@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
            exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
         }
      }
@@ -809,6 +815,14 @@
      
      //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()