Merged revisions 3803-3844 from stable branch.

tbrehm

2013-02-22 526b997c9891a796b152cdbab8e329b356b1f596

 install/dist/lib/gentoo.lib.php

@@ -36,15 +36,15 @@
      
      if (is_dir($conf['jailkit']['config_dir']))
      {
         $jkinit_content = $this->get_template_file($conf['jailkit']['jk_init'], true); // get contents
         $jkinit_content = $this->get_template_file($conf['jailkit']['jk_init'], true); //* get contents
         $this->write_config_file($conf['jailkit']['config_dir'] . '/' . $conf['jailkit']['jk_init'], $jkinit_content);
         
         $jkchroot_content = $this->get_template_file($conf['jailkit']['jk_chrootsh'], true); // get contents
         $jkchroot_content = $this->get_template_file($conf['jailkit']['jk_chrootsh'], true); //* get contents
         $this->write_config_file($conf['jailkit']['config_dir'] . '/' . $conf['jailkit']['jk_chrootsh'], $jkchroot_content);
      }
      
      $command = "chown root:root /var/www";
      caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
      $command = 'chown root:root /var/www';
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
    }
   
   public function configure_postfix($options = '')
@@ -58,18 +58,18 @@
            $this->error("The postfix configuration directory '$config_dir' does not exist.");
        }
        
        // Install virtual mappings
        foreach (glob("tpl/mysql-virtual_*.master") as $filename) {
           $this->process_postfix_config( basename($filename, ".master") );
        //* Install virtual mappings
        foreach (glob('tpl/mysql-virtual_*.master') as $filename) {
           $this->process_postfix_config( basename($filename, '.master') );
        }
        
      // Changing mode and group of the new created config files.
      //* 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');
      
      // Creating virtual mail user and group
      //* 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");
@@ -80,10 +80,8 @@
         caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");      
      }

      //* These postconf commands will be executed on installation and update
      $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',
@@ -99,14 +97,8 @@
         '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',
         'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
         'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.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',
@@ -119,23 +111,32 @@
         'body_checks = regexp:'.$config_dir.'/body_checks'
      );
      
      // Create the header and body check files
      //* These postconf commands will be executed on installation only
      if($this->is_update == false) {
         $postconf_commands = array_merge($postconf_commands,array(
            'myhostname = '.$conf['hostname'],
            'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
            'mynetworks = 127.0.0.0/8 [::1]/128'
         ));
      }
		
      //* 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
      //* Make a backup copy of the main.cf file
      copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
      
      // Executing the postconf commands
      //* 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);
      }
      
      // Create the SSL certificate
      //* Create the SSL certificate
      if (!stristr($options,'dont-create-certs'))  
      {
         $command = 'cd '.$config_dir.'; '
@@ -146,11 +147,13 @@
         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);
      //* We have to change the permissions of the courier authdaemon directory to make it accessible for maildrop.
      $command = 'chmod 755  /var/lib/courier/authdaemon/';
      if (is_dir('/var/lib/courier/authdaemon')) {
         caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
      }
      
      // Changing maildrop lines in posfix master.cf
      //* Changing maildrop lines in posfix master.cf
      $configfile = $config_dir.'/master.cf';
      $content = rf($configfile);

@@ -161,20 +164,20 @@
                          
      $this->write_config_file($configfile, $content);
      
      // Writing the Maildrop mailfilter file
      $content = rf("tpl/mailfilter.master");
      //* Writing the Maildrop mailfilter file
      $content = rf('tpl/mailfilter.master');
      $content = str_replace('{dist_postfix_vmail_mailbox_base}', $cf['vmail_mailbox_base'], $content);
      
      $this->write_config_file($cf['vmail_mailbox_base'].'/.mailfilter', $content);
      
      // Create the directory for the custom mailfilters
      //* 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");
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
      }
      
      // Chmod and chown the .mailfilter file
      //* 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");
      
@@ -187,37 +190,92 @@
   {
      global $conf;
   
      $content = $this->get_template_file('sasl_smtpd.conf', true, true); // get contents & insert db cred
      $content = $this->get_template_file('sasl_smtpd.conf', true, true); //* get contents & insert db cred
      $this->write_config_file($conf['saslauthd']['config_dir'].'/smtpd.conf', $content);
      
      // Edit the file saslauthd config file
      $content = rf($conf["saslauthd"]["config_file"]);
      //* Edit the file saslauthd config file
      $content = rf($conf['saslauthd']['config_file']);
      $content = preg_replace('/(?<=\n)SASLAUTHD_OPTS="\$\{SASLAUTHD_OPTS\}[^"]+"/', 'SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r -c -s 128 -t 30 -n 5"', $content);
      
      $this->write_config_file($conf["saslauthd"]["config_file"], $content);
      $this->write_config_file($conf['saslauthd']['config_file'], $content);
   }
   
   public function configure_courier()
    {
       global $conf;
       
      // authmysqlrc
      $content = $this->get_template_file('authmysqlrc', true, true); // get contents & insert db cred
      //* authmysqlrc
      $content = $this->get_template_file('authmysqlrc', true, true); //* get contents & insert db cred
      $this->write_config_file($conf['courier']['config_dir'].'/authmysqlrc', $content);
      
      // authdaemonrc
      //* authdaemonrc
      $configfile = $conf['courier']['config_dir'].'/authdaemonrc';

      $content = rf($configfile);
      $content = preg_replace('/(?<=\n)authmodulelist="[^"]+"/', "authmodulelist=\"authmysql\"", $content);
      $this->write_config_file($configfile, $content);
      
      // create certificates
      $command = "mkimapdcert";
      caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
      //* create certificates
      $command = 'mkimapdcert';
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         
      $command = "mkpop3dcert";
      $command = 'mkpop3dcert';
      caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
    }
    
    public function configure_dovecot() 
    {
       global $conf;
    	
       $config_dir = $conf['dovecot']['config_dir'];
    	
       $configfile = $conf['postfix']['config_dir'].'/master.cf';
    	
       if(is_file($configfile)) {
         copy($configfile, $configfile.'~2');
      }
      if(is_file($configfile.'~2')) {
         chmod($configfile.'~2', 0400);
      }
    	
       //* Configure master.cf and add a line for deliver
      $content = rf($configfile);
		
       if(!stristr($content,'dovecot/deliver')) {
         $deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
         af($conf['postfix']['config_dir'].'/master.cf',$deliver_content);
      }
      unset($content);
      unset($deliver_content);
      unset($configfile);
		
      //* Reconfigure postfix to use dovecot authentication
      $postconf_commands = array (
            '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 = $config_dir.'/dovecot.conf';
      $content = $this->get_template_file('dovecot.conf', true);
      $this->write_config_file($configfile, $content);
		
      //* dovecot-sql.conf
      $configfile = $config_dir.'/dovecot-sql.conf';
      $content = $this->get_template_file('debian_dovecot-sql.conf', true, true);
      $this->write_config_file($configfile, $content);
    }
   
   public function configure_spamassassin()
@@ -232,7 +290,7 @@
      $config_dir = $conf['getmail']['config_dir'];
      
      if (!is_dir($config_dir)) {
         exec("mkdir -p ".escapeshellcmd($config_dir));
         exec('mkdir -p '.escapeshellcmd($config_dir));
      }

      $command = "useradd -d $config_dir ".$conf['getmail']['user'];
@@ -246,7 +304,7 @@
      $command = "chmod -R 700 $config_dir";
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
      
      // Getmail will be run from cron. In order to have access to cron the getmail user needs to be part of the cron group.
      //* Getmail will be run from cron. In order to have access to cron the getmail user needs to be part of the cron group.
      $command = "gpasswd -a getmail " . $conf['cron']['group'];
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
   }
@@ -255,25 +313,22 @@
    {
      global $conf;
      
      // Amavisd-new user config file
      //* Amavisd-new user config file
      $conf_file = 'amavisd-ispconfig.conf';
      $conf_path = dirname($conf['amavis']['config_file']) . '/' . $conf_file;
      
      $content = $this->get_template_file($conf_file, true, true); // get contents & insert db cred
      $content = $this->get_template_file($conf_file, true, true); //* get contents & insert db cred
      $this->write_config_file($conf_path, $content);
      
      // Activate config directory in default file
      //* Activate config directory in default file
      $amavis_conf = rf($conf['amavis']['config_file']);
      if (strpos($amavis_conf, $conf_path) === false) 
      if (stripos($amavis_conf, $conf_path) === false) 
      {
         $amavis_conf = preg_replace('/(#-------------\n1;)/', 
                            "include_config_files('$conf_path');\n$1", 
                           $amavis_conf);
									
         $amavis_conf = preg_replace('/^(1;.*)$/m', "include_config_files('$conf_path');\n$1", $amavis_conf);
         $this->write_config_file($conf['amavis']['config_file'], $amavis_conf);
      }
      
      // Adding the amavisd commands to the postfix configuration
      //* 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'
@@ -281,21 +336,21 @@
      
       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
      $content = rf($conf["postfix"]["config_dir"].'/master.cf');
      //* Append the configuration for amavisd to the master.cf file
      $content = rf($conf['postfix']['config_dir'].'/master.cf');
      
      if(!stristr($content,"127.0.0.1:10025")) // Only add the content if we had not addded it before 
      if(!stristr($content,'127.0.0.1:10025')) //* Only add the content if we had not addded it before 
      { 
         unset($content);
         $content = $this->get_template_file("master_cf_amavis", true);
         af($conf["postfix"]["config_dir"].'/master.cf', $content);
         $content = $this->get_template_file('master_cf_amavis', true);
         af($conf['postfix']['config_dir'].'/master.cf', $content);
      }
      unset($content);
      
      // Add the clamav user to the amavis group
      //* Add the clamav user to the amavis group
      exec('usermod -a -G amavis clamav');
    }
    
@@ -304,35 +359,37 @@
      global $conf;
      
      //* configure pure-ftpd for MySQL authentication against the ispconfig database
      $content = $this->get_template_file('pureftpd_mysql.conf', true, true); // get contents & insert db cred
      $content = str_replace('{server_id}', $conf["server_id"], $content);
      $content = $this->get_template_file('pureftpd_mysql.conf', true, true); //* get contents & insert db cred
      $content = str_replace('{server_id}', $conf['server_id'], $content);
      
      $this->write_config_file($conf['pureftpd']['mysql_config_file'], $content, 600, 'root', 'root');
      
      // **enable pure-ftpd and server settings
      //* enable pure-ftpd and server settings
      $content = rf($conf["pureftpd"]["config_file"]);
      
      $content = preg_replace('/#?IS_CONFIGURED="(?:yes|no)"/', 'IS_CONFIGURED="yes"', $content);
      $content = str_replace('AUTH="-l unix"', 'AUTH="-l mysql:'.$conf['pureftpd']['mysql_config_file'].'"', $content);
      
      // Logging defaults to syslog's ftp facility. Override this behaviour for better compatibility with debian/ubuntu
      // and specify the format.
      //* Logging defaults to syslog's ftp facility. Override this behaviour for better compatibility with debian/ubuntu
      //* and specify the format.
      $logdir = '/var/log/pure-ftpd';
      if (!is_dir($logdir)) {
         mkdir($logdir, 0755, true);
      }
      
      /*
      /**
       * @link http://download.pureftpd.org/pub/pure-ftpd/doc/README
       * -b brokenclientscompatibility
       * -A chrooteveryone
       * -E noanonymous
       * -O altlog <format>:<log file>
       * -Z customerproof (Add safe guards against common customer mistakes ie. like chmod 0 on their own files)
       * -D displaydotfiles 
       * -H dontresolve
       */
      $content = preg_replace('/MISC_OTHER="[^"]+"/', 'MISC_OTHER="-b -A -E -Z -O clf:'.$logdir.'/transfer.log"', $content);
      $content = preg_replace('/MISC_OTHER="[^"]+"/', 'MISC_OTHER="-b -A -E -Z -D -H -O clf:'.$logdir.'/transfer.log"', $content);
      
      $this->write_config_file($conf["pureftpd"]["config_file"], $content);
      $this->write_config_file($conf['pureftpd']['config_file'], $content);
    }
    
   public function configure_powerdns() 
@@ -345,7 +402,7 @@
      }
      
      //* 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);
      }
@@ -363,14 +420,41 @@
      }
      
      //* Create the powerdns config file
      $content = $this->get_template_file('pdns.local', true, true); // get contents & insert db cred
      $content = $this->get_template_file('pdns.local', true, true); //* get contents & insert db cred
      $content = str_replace('{powerdns_database}', $conf['powerdns']['database'], $content);
      
      $this->write_config_file($conf["powerdns"]["config_dir"].'/'.$conf["powerdns"]["config_file"], $content, 600, 'root', 'root');

      // Create symlink to init script to start the correct config file
      //* Create symlink to init script to start the correct config file
      if( !is_link($conf['init_scripts'].'/'.$conf['powerdns']['init_script']) ) {
         symlink($conf['init_scripts'].'/pdns', $conf['init_scripts'].'/'.$conf['powerdns']['init_script']);
      }
   }
	
   public function configure_bind() {
      global $conf;

       //* Check if the zonefile directory has a slash at the end
       $content=$conf['bind']['bind_zonefiles_dir'];
       if(substr($content,-1,1) != '/') {
           $content .= '/';
      }
		
      //* New default format of named.conf uses views. Check which version the system is using and include our zones file.
      $named_conf = rf($conf['bind']['named_conf_path']);
      if (stripos($named_conf, 'include "'.$conf['bind']['named_conf_local_path'].'";') === false) 
      {
         preg_match_all("/(?<=\n)view \"(?:public|internal)\" in \{.*\n\};/Us", $named_conf, $views);
         if (count($views[0]) == 2) {
            foreach ($views[0] as $view) {
               $named_conf = str_replace($view, substr($view, 0, -2)."include \"{$conf['bind']['named_conf_local_path']}\";\n};", $named_conf);
            }
				
            wf($conf['bind']['named_conf_path'], $named_conf);
         }
         else {
            af($conf['bind']['named_conf_path'], 'include "'.$conf['bind']['named_conf_local_path'].'";');
         }
      }
   }
   
@@ -378,22 +462,26 @@
    {   
      global $conf;
      
      // Create the logging directory for the vhost logfiles
      if (!is_dir('/var/log/ispconfig/httpd')) {
         mkdir('/var/log/ispconfig/httpd', 0755, true);
      if($conf['apache']['installed'] == false) return;
      //* Create the logging directory for the vhost logfiles
      if (!is_dir($conf['ispconfig_log_dir'].'/httpd')) {
         mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
      }
      
      if (is_file($conf['suphp']['config_file'])) 
      {
         $content = rf($conf['suphp']['config_file']);
         
         $content = preg_replace('/;Handler for php-scripts/',";Handler for php-scripts\nx-httpd-suphp=php:/usr/bin/php-cgi", $content);
         $content = preg_replace('/;?umask=\d+/','umask=0022', $content);
         if (!preg_match('|^x-httpd-suphp=php:/usr/bin/php-cgi$|m', $content))
         {
            $content = preg_replace('/;Handler for php-scripts/',";Handler for php-scripts\nx-httpd-suphp=php:/usr/bin/php-cgi", $content);
            $content = preg_replace('/;?umask=\d+/','umask=0022', $content);
         }
         
         $this->write_config_file($conf['suphp']['config_file'], $content);
      }
      
      // Enable ISPConfig default vhost settings
      //* Enable ISPConfig default vhost settings
      $default_vhost_path = $conf['apache']['vhost_conf_dir'].'/'.$conf['apache']['vhost_default'];
      if (is_file($default_vhost_path)) 
      {
@@ -405,7 +493,7 @@
         $this->write_config_file($default_vhost_path, $content);
      }
      
      // Generate default ssl certificates
      //* Generate default ssl certificates
      if (!is_dir($conf['apache']['ssl_dir'])) {
         mkdir($conf['apache']['ssl_dir']);
      }
@@ -424,7 +512,7 @@
      
      
      
      // Copy the ISPConfig configuration include
      //* Copy the ISPConfig configuration include
      $content = $this->get_template_file('apache_ispconfig.conf', true);
      
      $records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
@@ -438,7 +526,7 @@
      
      $this->write_config_file($conf['apache']['vhost_conf_dir'].'/000-ispconfig.conf', $content);
      
      // Gentoo by default does not include .vhost files. Add include line to config file.
      //* Gentoo by default does not include .vhost files. Add include line to config file.
      $content = rf($conf['apache']['config_file']);
      if ( strpos($content, 'Include /etc/apache2/vhosts.d/*.vhost') === false ) {
         $content = preg_replace('|(Include /etc/apache2/vhosts.d/\*.conf)|',"$1\nInclude /etc/apache2/vhosts.d/*.vhost", $content);
@@ -446,21 +534,21 @@
      
      $this->write_config_file($conf['apache']['config_file'], $content);
      
      // make sure that webalizer finds its config file when it is directly in /etc
      //* make sure that webalizer finds its config file when it is directly in /etc
      if(is_file('/etc/webalizer.conf') && !is_dir('/etc/webalizer')) 
      {
         mkdir('/etc/webalizer', 0755);
         symlink('/etc/webalizer.conf', '/etc/webalizer/webalizer.conf');
      }
      
       if(is_file('/etc/webalizer/webalizer.conf')) // Change webalizer mode to incremental 
       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
      //* add a sshusers group
      if (!is_group('sshusers')) 
      {
         $command = 'groupadd sshusers';
@@ -473,55 +561,137 @@
      global $conf;
      
      //* Create the ispconfig apps vhost user and group
      if($conf['apache']['installed'] == true){
         $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');
      
      $apps_vhost_user = $conf['web']['apps_vhost_user'];
      $apps_vhost_group = $conf['web']['apps_vhost_group'];
      $install_dir = $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 = '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 = "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");
      
      $command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         if(!@is_dir($install_dir)){
            mkdir($install_dir, 0755, true);
         } else {
            chmod($install_dir, 0755);
         }
         chown($install_dir, $apps_vhost_user);
         chgrp($install_dir, $apps_vhost_group);
      
      exec('mkdir -p '.escapeshellcmd($conf['web']['website_basedir'].'/apps'));
		
      //* 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'];
         //* 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 = $this->get_template_file('apache_apps.vhost', true);
         //* Dont just copy over the virtualhost template but add some custom settings
         $content = $this->get_template_file('apache_apps.vhost', true);
        
        $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);
         $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);
         //* 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);
         }
		
         $this->write_config_file("$vhost_conf_dir/apps.vhost", $content);
		
         if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') ) 
         {
            $content = rf('tpl/apache_apps_fcgi_starter.master');
            $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
            $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
            mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true);
            //copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
            wf($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter', $content);
            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');
			
         }
      }
		
      $this->write_config_file("$vhost_conf_dir/apps.vhost", $content);
		
      if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') ) 
      {
         exec('mkdir -p '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
         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');
      if($conf['nginx']['installed'] == true){
         $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['nginx']['user'].' '.$apps_vhost_group;
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

         if(!@is_dir($install_dir)){
            mkdir($install_dir, 0755, true);
         } else {
            chmod($install_dir, 0755);
         }
         chown($install_dir, $apps_vhost_user);
         chgrp($install_dir, $apps_vhost_group);

         //* Copy the apps vhost file
         $vhost_conf_dir = $conf['nginx']['vhost_conf_dir'];
         $vhost_conf_enabled_dir = $conf['nginx']['vhost_conf_enabled_dir'];
         $apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '')?'_':$conf['web']['apps_vhost_servername'];

         // Dont just copy over the virtualhost template but add some custom settings
         $content = rf('tpl/nginx_apps.vhost.master');
			
         if($conf['web']['apps_vhost_ip'] == '_default_'){
            $apps_vhost_ip = '';
         } else {
            $apps_vhost_ip = $conf['web']['apps_vhost_ip'].':';
         }
			
         $socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
         if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
         if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
         $fpm_socket = $socket_dir.'apps.sock';
         $cgi_socket = escapeshellcmd($conf['nginx']['cgi_socket']);

         $content = str_replace('{apps_vhost_ip}', $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('{apps_vhost_servername}', $apps_vhost_servername, $content);
         //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);
         $content = str_replace('{cgi_socket}', $cgi_socket, $content);

         wf($vhost_conf_dir.'/apps.vhost', $content);
			
         // PHP-FPM
         // Dont just copy over the php-fpm pool template but add some custom settings
         $content = rf('tpl/apps_php_fpm_pool.conf.master');
         $content = str_replace('{fpm_pool}', 'apps', $content);
         //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);
         $content = str_replace('{fpm_user}', $apps_vhost_user, $content);
         $content = str_replace('{fpm_group}', $apps_vhost_group, $content);
         wf($conf['nginx']['php_fpm_pool_dir'].'/apps.conf', $content);

         //copy('tpl/nginx_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
         //* and create the symlink
         if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
         if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
            symlink($vhost_conf_dir.'/apps.vhost',$vhost_conf_enabled_dir.'/000-apps.vhost');
         }
         
      }
   }
@@ -532,14 +702,14 @@
      
      $install_dir = $conf['ispconfig_install_dir'];
      
       // Create the ISPConfig installation directory
       //* Create the ISPConfig installation directory
      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
      //* Create a ISPConfig user and group
      if (!is_group('ispconfig')) 
      {
         $command = 'groupadd ispconfig';
@@ -552,18 +722,18 @@
         caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
      }
      
      // copy the ISPConfig interface part
      //* 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
      //* 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 the config file for ISPConfig interface
      //* Create the config file for ISPConfig interface
      $configfile = 'config.inc.php';
      $content = $this->get_template_file($configfile, true, true); // get contents & insert db cred
      $content = $this->get_template_file($configfile, true, true); //* get contents & insert db cred
      
      $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);
@@ -573,11 +743,20 @@
      $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);
      $content = str_replace('{timezone}', $conf['timezone'], $content);
      $content = str_replace('{theme}', $conf['theme'], $content);
      
      $this->write_config_file("$install_dir/interface/lib/$configfile", $content);
      
      // Create the config file for ISPConfig server
      //* Create the config file for ISPConfig server
      $this->write_config_file("$install_dir/server/lib/$configfile", $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 = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
         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.
@@ -590,9 +769,15 @@
                  $module_name = substr($file,0,-8);
                  $tmp = new $module_name;
                  if($tmp->onInstall()) {
                     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);
                        // @symlink($install_dir.'/server/mods-available/'.$file, '../mods-enabled/'.$file);
                     }
                     if (strpos($file, '_core_module') !== false) {
                        if(!@is_link($install_dir.'/server/mods-core/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file);
                        if(!@is_link($install_dir.'/server/mods-core/'.$file)) {
                           @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file);
                           // @symlink($install_dir.'/server/mods-available/'.$file, '../mods-core/'.$file);
                        }
                     }
                  }
                  unset($tmp);
@@ -601,19 +786,25 @@
            closedir($dh);
         }
      }
		

      $dir = $install_dir.'/server/plugins-available/';
      if (is_dir($dir)) {
         if ($dh = opendir($dir)) {
            while (($file = readdir($dh)) !== false) {
               if($conf['apache']['installed'] == true && $file == 'nginx_plugin.inc.php') continue;
               if($conf['nginx']['installed'] == true && $file == 'apache2_plugin.inc.php') continue;
               if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
                  include_once($install_dir.'/server/plugins-available/'.$file);
                  $plugin_name = substr($file,0,-8);
                  $tmp = new $plugin_name;
                  if(method_exists($tmp,'onInstall') && $tmp->onInstall()) {
                     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);
                     }
                     if (strpos($file, '_core_plugin') !== false) {
                        if(!@is_link($install_dir.'/server/plugins-core/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file);
                        if(!@is_link($install_dir.'/server/plugins-core/'.$file)) {
                           @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file);
                        }
                     }
                  }
                  unset($tmp);
@@ -623,7 +814,7 @@
         }
      }
      
      // Update the server config
      //* Update the server config
      $mail_server_enabled = ($conf['services']['mail'])?1:0;
      $web_server_enabled = ($conf['services']['web'])?1:0;
      $dns_server_enabled = ($conf['services']['dns'])?1:0;
@@ -640,21 +831,23 @@
         $this->db->query($sql);
      }
      
      // Chmod the files
      //* 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
      //* 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
      //* 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
      exec("chmod -R 770 $install_dir/interface/web/temp");
      //* 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
       //* Make all interface language file directories group writable
      $handle = @opendir($install_dir.'/interface/web');
      while ($file = @readdir ($handle)) { 
            if ($file != '.' && $file != '..') {
@@ -670,74 +863,170 @@
         }
      }
      
       // 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");
      //* Make the APS directories group writable
      exec("chmod -R 770 $install_dir/interface/web/sites/aps_meta_packages");
      exec("chmod -R 770 $install_dir/server/aps_packages");
		
       //* make sure that the server config file (not the interface one) is only readable by the root user
      chmod($install_dir.'/server/lib/config.inc.php', 0600);
      chown($install_dir.'/server/lib/config.inc.php', 'root');
      chgrp($install_dir.'/server/lib/config.inc.php', 'root');
		
      //* Make sure thet the interface config file is readable by user ispconfig only
      chmod($install_dir.'/interface/lib/config.inc.php', 0600);
      chown($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
      chgrp($install_dir.'/interface/lib/config.inc.php', 'ispconfig');

      chmod($install_dir.'/server/lib/remote_action.inc.php', 0600);
      chown($install_dir.'/server/lib/remote_action.inc.php', 'root');
      chgrp($install_dir.'/server/lib/remote_action.inc.php', 'root');

      if(@is_file($install_dir.'/server/lib/mysql_clientdb.conf')) {
         chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600);
         chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
         chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
      }
		
      if(is_dir($install_dir.'/interface/invoices')) {
         exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
         exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
      }
      
      // 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 = 'usermod -a -G ispconfig '.$conf['apache']['user'];
      caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
      if($conf['apache']['installed'] == true){
         $command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         if(is_group('ispapps')){
            $command = 'usermod -a -G ispapps '.$conf['apache']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         }
      }
      if($conf['nginx']['installed'] == true){
         $command = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         if(is_group('ispapps')){
            $command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         }
      }
      
      // Make the shell scripts executable
      //* 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
      $content = $this->get_template_file("apache_ispconfig.vhost", true);
      $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
      if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
         //* Copy the ISPConfig vhost for the controlpanel
         $content = $this->get_template_file("apache_ispconfig.vhost", true);
         $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);
         //* 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);
         }
		
         if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
            $content = str_replace('{ssl_comment}', '', $content);
         } else {
            $content = str_replace('{ssl_comment}', '#', $content);
         }
         if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) {
            $content = str_replace('{ssl_bundle_comment}', '', $content);
         } else {
            $content = str_replace('{ssl_bundle_comment}', '#', $content);
         }
		
         $vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
         $this->write_config_file($vhost_path, $content);
		
         if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
            $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
            $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
            $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
            mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
            wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
            exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
            chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755);
            symlink($install_dir.'/interface/web','/var/www/ispconfig');
            exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
         }
      }

      if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
         //* Copy the ISPConfig vhost for the controlpanel
         $vhost_conf_dir = $conf['nginx']['vhost_conf_dir'];
         $vhost_conf_enabled_dir = $conf['nginx']['vhost_conf_enabled_dir'];

         // Dont just copy over the virtualhost template but add some custom settings
         $content = rf('tpl/nginx_ispconfig.vhost.master');
         $content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
		
         if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
            $content = str_replace('{ssl_on}', ' on', $content);
            $content = str_replace('{ssl_comment}', '', $content);
            $content = str_replace('{fastcgi_ssl}', 'on', $content);
         } else {
            $content = str_replace('{ssl_on}', ' off', $content);
            $content = str_replace('{ssl_comment}', '#', $content);
            $content = str_replace('{fastcgi_ssl}', 'off', $content);
         }
			
         $socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
         if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
         if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
         $fpm_socket = $socket_dir.'ispconfig.sock';
			
         //$content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);

         wf($vhost_conf_dir.'/ispconfig.vhost', $content);
			
         unset($content);
			
         // PHP-FPM
         // Dont just copy over the php-fpm pool template but add some custom settings
         $content = rf('tpl/php_fpm_pool.conf.master');
         $content = str_replace('{fpm_pool}', 'ispconfig', $content);
         //$content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);
         $content = str_replace('{fpm_user}', 'ispconfig', $content);
         $content = str_replace('{fpm_group}', 'ispconfig', $content);
         wf($conf['nginx']['php_fpm_pool_dir'].'/ispconfig.conf', $content);

         //copy('tpl/nginx_ispconfig.vhost.master', $vhost_conf_dir.'/ispconfig.vhost');
         //* and create the symlink
         if($this->is_update == false) {
            if(@is_link($vhost_conf_enabled_dir.'/ispconfig.vhost')) unlink($vhost_conf_enabled_dir.'/ispconfig.vhost');
            if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.vhost')) {
               symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
            }
         }
      }
      
      if(is_file('/usr/local/ispconfig/interface/ssl/ispserver.crt') && is_file('/usr/local/ispconfig/interface/ssl/ispserver.key')) {
         $content = str_replace('{ssl_comment}', '', $content);
      } else {
         $content = str_replace('{ssl_comment}', '#', $content);
      }
		
      $vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
      $this->write_config_file($vhost_path, $content);
		
       if (!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) 
       {
         mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
         copy('tpl/apache_ispconfig_fcgi_starter.master', '/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
         chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755);
         symlink('/usr/local/ispconfig/interface/web', '/var/www/ispconfig');
         exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
      }
		
      // Install the update script
      //* Install the update script
      if (is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) {
         unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
      }
      
      chown('/usr/local/ispconfig/server/scripts/update_from_svn.sh', 'root');
      chmod('/usr/local/ispconfig/server/scripts/update_from_svn.sh', 0700);
      chown('/usr/local/ispconfig/server/scripts/update_from_tgz.sh', 'root');
      chmod('/usr/local/ispconfig/server/scripts/update_from_tgz.sh', 0700);
      chown('/usr/local/ispconfig/server/scripts/ispconfig_update.sh', 'root');
      chmod('/usr/local/ispconfig/server/scripts/ispconfig_update.sh', 0700);
      chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
      chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
      chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
      chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
      chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
      chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
      
      if (!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) {
         symlink('/usr/local/ispconfig/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
         symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
      }
      
      if (!is_link('/usr/local/bin/ispconfig_update.sh')) {
         symlink('/usr/local/ispconfig/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');
         symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');
      }
      
      // Make the logs readable for the ispconfig user
      //* Make the logs readable for the ispconfig user
      if (is_file('/var/log/maillog')) {
         exec('chmod +r /var/log/maillog');
      }
@@ -751,17 +1040,31 @@
         exec('chmod +r /var/log/clamav/freshclam.log');
      }
      
      // Create the ispconfig log directory
      //* Create the ispconfig log directory
      if (!is_dir($conf['ispconfig_log_dir'])) {
         mkdir($conf['ispconfig_log_dir']);
      }
      if (!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) {
         exec('touch '.$conf['ispconfig_log_dir'].'/ispconfig.log');
         touch($conf['ispconfig_log_dir'].'/ispconfig.log');
      }
      
      exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
      exec('chown getmail /usr/local/bin/run-getmail.sh');
      exec('chmod 744 /usr/local/bin/run-getmail.sh');
      //* Create the ispconfig auth log file and set uid/gid
      if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {
         touch($conf['ispconfig_log_dir'].'/auth.log');
      }
      exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log');
      exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log');
		
      rename($install_dir.'/server/scripts/run-getmail.sh', '/usr/local/bin/run-getmail.sh');
		
      if (is_user('getmail')) {
         chown('/usr/local/bin/run-getmail.sh', 'getmail');
      }
      chmod('/usr/local/bin/run-getmail.sh', 0744);
		
      //* Remove Domain module as its functions are available in the client module now
      if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
		
    }
}