gitlabFork/ISPConfig3.git - Solinfo Gitblit

			@@ -29,197 +29,288 @@
			*/

			class installer_dist extends installer_base {


			public function configure_mailman($status = 'insert') {
			global $conf;

			$config_dir = $conf['mailman']['config_dir'].'/';
			$full_file_name = $config_dir.'mm_cfg.py';
			//* Backup exiting file
			if(is_file($full_file_name)) {
			copy($full_file_name, $config_dir.'mm_cfg.py~');
			}

			// load files
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mm_cfg.py.master', 'tpl/mm_cfg.py.master');
			$old_file = rf($full_file_name);

			$old_options = array();
			$lines = explode("\n", $old_file);
			foreach ($lines as $line)
			{
			if (trim($line) != '' && substr($line, 0, 1) != '#')
			{
			@list($key, $value) = @explode("=", $line);
			if (!empty($value))
			{
			$key = rtrim($key);
			$old_options[$key] = trim($value);
			}
			}
			}

			if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
			exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');

			$virtual_domains = '';
			if($status == 'update')
			{
			// create virtual_domains list
			$domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain");

			if(is_array($domainAll)) {
			foreach($domainAll as $domain)
			{
			if ($domainAll[0]['domain'] == $domain['domain'])
			$virtual_domains .= "'".$domain['domain']."'";
			else
			$virtual_domains .= ", '".$domain['domain']."'";
			}
			}
			}
			else
			$virtual_domains = "' '";

			$content = str_replace('{hostname}', $conf['hostname'], $content);
			if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = '';
			$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
			$content = str_replace('{virtual_domains}', $virtual_domains, $content);

			wf($full_file_name, $content);

			//* Write virtual_to_transport.sh script
			$config_dir = $conf['mailman']['config_dir'].'/';
			$full_file_name = $config_dir.'virtual_to_transport.sh';

			//* Backup exiting virtual_to_transport.sh script
			if(is_file($full_file_name)) {
			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
			}

			if(is_dir('/etc/mailman')) {
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh', $full_file_name);
			} else {
			copy('tpl/mailman-virtual_to_transport.sh', $full_file_name);
			}
			chgrp($full_file_name, 'mailman');
			chmod($full_file_name, 0750);
			}

			//* Create aliasaes
			exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');

			}

			function configure_postfix($options = '')
			{
			global $conf;
			{
			global $conf,$autoinstall;
			$cf = $conf['postfix'];
			$config_dir = $cf['config_dir'];


			if(!is_dir($config_dir)){
			$this->error("The postfix configuration directory '$config_dir' does not exist.");
			}

			$this->error("The postfix configuration directory '$config_dir' does not exist.");
			}

			//* mysql-virtual_domains.cf
			$this->process_postfix_config('mysql-virtual_domains.cf');
			$this->process_postfix_config('mysql-virtual_domains.cf');

			//* mysql-virtual_forwardings.cf
			$this->process_postfix_config('mysql-virtual_forwardings.cf');
			$this->process_postfix_config('mysql-virtual_forwardings.cf');

			//* mysql-virtual_mailboxes.cf
			$this->process_postfix_config('mysql-virtual_mailboxes.cf');
			$this->process_postfix_config('mysql-virtual_mailboxes.cf');

			//* mysql-virtual_email2email.cf
			$this->process_postfix_config('mysql-virtual_email2email.cf');
			$this->process_postfix_config('mysql-virtual_email2email.cf');

			//* mysql-virtual_transports.cf
			$this->process_postfix_config('mysql-virtual_transports.cf');
			$this->process_postfix_config('mysql-virtual_transports.cf');

			//* mysql-virtual_recipient.cf
			$this->process_postfix_config('mysql-virtual_recipient.cf');
			$this->process_postfix_config('mysql-virtual_recipient.cf');

			//* mysql-virtual_sender.cf
			$this->process_postfix_config('mysql-virtual_sender.cf');
			$this->process_postfix_config('mysql-virtual_sender.cf');

			//* mysql-virtual_client.cf
			$this->process_postfix_config('mysql-virtual_client.cf');

			$this->process_postfix_config('mysql-virtual_client.cf');

			//* mysql-virtual_relaydomains.cf
			$this->process_postfix_config('mysql-virtual_relaydomains.cf');

			$this->process_postfix_config('mysql-virtual_relaydomains.cf');

			//* mysql-virtual_relayrecipientmaps.cf
			$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
			$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');

			//* Changing mode and group of the new created config files.
			caselog('chmod o= '.$config_dir.'/mysql-virtual_.cf &> /dev/null',
			__FILE__, __LINE__, 'chmod on mysql-virtual_.cf', 'chmod on mysql-virtual_.cf failed');
			caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_.cf &> /dev/null',
			__FILE__, __LINE__, 'chgrp on mysql-virtual_.cf', 'chgrp on mysql-virtual_.cf failed');

			__FILE__, __LINE__, 'chmod on mysql-virtual_.cf', 'chmod on mysql-virtual_.cf failed');
			caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_.cf &> /dev/null',
			__FILE__, __LINE__, 'chgrp on mysql-virtual_.cf', 'chgrp on mysql-virtual_.cf failed');

			//* Creating virtual mail user and group
			$command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
			if(!is_group($cf['vmail_groupname'])) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			$command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m';
			if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* These postconf commands will be executed on installation and update
			$postconf_commands = array (
			'virtual_alias_domains =',
			'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
			'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
			'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf',
			'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
			'virtual_uid_maps = static:'.$cf['vmail_userid'],
			'virtual_gid_maps = static:'.$cf['vmail_groupid'],
			'smtpd_sasl_auth_enable = yes',
			'broken_sasl_auth_clients = yes',
			'smtpd_sasl_authenticated_header = yes',
			'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination',
			'smtpd_use_tls = yes',
			'smtpd_tls_security_level = may',
			'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert',
			'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
			'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
			'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
			'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
			'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
			'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
			'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',
			'maildrop_destination_concurrency_limit = 1',
			'maildrop_destination_recipient_limit = 1',
			'virtual_transport = maildrop',
			'header_checks = regexp:'.$config_dir.'/header_checks',
			'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks',
			'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks',
			'body_checks = regexp:'.$config_dir.'/body_checks',
			'inet_interfaces = all'
			);

			$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
			$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
			unset($server_ini_rec);

			//* If there are RBL's defined, format the list and add them to smtp_recipient_restrictions to prevent removeal after an update
			$rbl_list = '';
			if (@isset($server_ini_array['mail']['realtime_blackhole_list']) && $server_ini_array['mail']['realtime_blackhole_list'] != '') {
			$rbl_hosts = explode(",", str_replace(" ", "", $server_ini_array['mail']['realtime_blackhole_list']));
			foreach ($rbl_hosts as $key => $value) {
			$rbl_list .= ", reject_rbl_client ". $value;
			}
			}
			unset($rbl_hosts);
			unset($server_ini_array);

			//* These postconf commands will be executed on installation and update
			$postconf_placeholders = array('{config_dir}' => $config_dir,
			'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
			'{vmail_userid}' => $cf['vmail_userid'],
			'{vmail_groupid}' => $cf['vmail_groupid'],
			'{rbl_list}' => $rbl_list);

			$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');
			$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
			$postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines

			//* 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'
			));
			$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');



			//* Create the mailman files
			if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
			//if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
			if(is_file('/var/lib/mailman/data/aliases')) unlink('/var/lib/mailman/data/aliases');
			if(!is_link('/var/lib/mailman/data/aliases')) symlink('/etc/mailman/aliases', '/var/lib/mailman/data/aliases');
			exec('postalias /var/lib/mailman/data/aliases');
			if(!is_file('/etc/mailman/virtual-mailman')) touch('/etc/mailman/virtual-mailman');
			exec('postmap /etc/mailman/virtual-mailman');
			if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
			exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');

			//* Make a backup copy of the main.cf file
			copy($config_dir.'/main.cf', $config_dir.'/main.cf~');


			//* Executing the postconf commands
			foreach($postconf_commands as $cmd) {
			$command = "postconf -e '$cmd'";
			caselog($command." &> /dev/null", __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
			}

			if(!stristr($options,'dont-create-certs')) {

			if(!stristr($options, 'dont-create-certs')) {
			//* Create the SSL certificate
			$command = 'cd '.$config_dir.'; '
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
			if(AUTOINSTALL){
			$command = 'cd '.$config_dir.'; '
			."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509";
			} else {
			$command = 'cd '.$config_dir.'; '
			.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
			}
			exec($command);


			$command = 'chmod o= '.$config_dir.'/smtpd.key';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
			}


			//** We have to change the permissions of the courier authdaemon directory to make it accessible for maildrop.
			$command = 'chmod 755 /var/spool/authdaemon';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);


			//* Changing maildrop lines in posfix master.cf
			if(is_file($config_dir.'/master.cf')){
			copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
			}
			copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
			}
			if(is_file($config_dir.'/master.cf~')){
			exec('chmod 400 '.$config_dir.'/master.cf~');
			}
			exec('chmod 400 '.$config_dir.'/master.cf~');
			}
			$configfile = $config_dir.'/master.cf';
			$content = rf($configfile);
			// if postfix package is from fedora or centios main repo
			$content = str_replace('# flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}',
			' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);

			$content = str_replace('# flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}',
			' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);

			// If postfix package is from centos plus repo
			$content = str_replace('# flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}',
			' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);

			$content = str_replace(' flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}',
			' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);


			$content = str_replace('#maildrop unix - n n - - pipe',
			'maildrop unix - n n - - pipe',
			$content);

			$content = str_replace('# flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}',
			' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);

			$content = str_replace(' flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}',
			' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
			$content);


			$content = str_replace('#maildrop unix - n n - - pipe',
			'maildrop unix - n n - - pipe',
			$content);

			wf($configfile, $content);


			//* Writing the Maildrop mailfilter file
			$configfile = 'mailfilter';
			if(is_file($cf['vmail_mailbox_base'].'/.'.$configfile)){
			copy($cf['vmail_mailbox_base'].'/.'.$configfile, $cf['vmail_mailbox_base'].'/.'.$configfile.'~');
			}
			$content = rf("tpl/$configfile.master");
			copy($cf['vmail_mailbox_base'].'/.'.$configfile, $cf['vmail_mailbox_base'].'/.'.$configfile.'~');
			}
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "tpl/$configfile.master");
			$content = str_replace('{dist_postfix_vmail_mailbox_base}', $cf['vmail_mailbox_base'], $content);
			wf($cf['vmail_mailbox_base'].'/.'.$configfile, $content);


			//* Create the directory for the custom mailfilters
			$command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
			caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			//* Chmod and chown the .mailfilter file
			$command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';
			caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			$command = 'chmod -R 600 '.$cf['vmail_mailbox_base'].'/.mailfilter';
			caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			}


			public function configure_saslauthd() {
			global $conf;


			$configfile = 'tpl/fedora_saslauthd_smtpd_conf.master';
			$content = rf($configfile);
			wf('/usr/lib/sasl2/smtpd.conf',$content);
			if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl/smtpd.conf',$content);
			if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl2/smtpd.conf',$content);

			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_saslauthd_smtpd_conf.master', $configfile);
			wf('/usr/lib/sasl2/smtpd.conf', $content);
			if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl/smtpd.conf', $content);
			if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl2/smtpd.conf', $content);

			}


			public function configure_pam()
			{
			{
			global $conf;
			$pam = $conf['pam'];
			//* configure pam for SMTP authentication agains the ispconfig database
			@@ -227,7 +318,7 @@
			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 = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "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);
			@@ -237,68 +328,68 @@
			if(is_file("$pam/smtp")) exec("chmod o= $pam/smtp");
			//exec("chmod 660 $pam/smtp");
			//exec("chown root:root $pam/smtp");


			}


			public function configure_courier()
			{
			{
			global $conf;
			$config_dir = $conf['courier']['config_dir'];
			//* authmysqlrc
			$configfile = 'authmysqlrc';
			if(is_file("$config_dir/$configfile")){
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			}
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			}
			exec("chmod 400 $config_dir/$configfile~");
			$content = rf("tpl/$configfile.master");
			$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
			$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 = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "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("$config_dir/$configfile", $content);


			exec("chmod 660 $config_dir/$configfile");
			exec("chown root:root $config_dir/$configfile");


			//* authdaemonrc
			$configfile = $conf['courier']['config_dir'].'/authdaemonrc';
			if(is_file($configfile)){
			copy($configfile, $configfile.'~');
			}
			copy($configfile, $configfile.'~');
			}
			if(is_file($configfile.'~')){
			exec('chmod 400 '.$configfile.'~');
			}
			exec('chmod 400 '.$configfile.'~');
			}
			$content = rf($configfile);
			$content = str_replace('authmodulelist=', 'authmodulelist="authmysql"', $content);
			wf($configfile, $content);
			}


			public function configure_dovecot()
			{
			{
			global $conf;


			$config_dir = $conf['dovecot']['config_dir'];


			//* Use /etc/dovecot as config dir if exists
			if(is_dir('/etc/dovecot')) $config_dir = '/etc/dovecot';


			//* Configure master.cf and add a line for deliver
			if(is_file($config_dir.'/master.cf')){
			copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
			}
			copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
			}
			if(is_file($config_dir.'/master.cf~')){
			exec('chmod 400 '.$config_dir.'/master.cf~2');
			}
			exec('chmod 400 '.$config_dir.'/master.cf~2');
			}
			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
			// Only add the content if we had not addded it before
			if(!stristr($content,"dovecot/deliver")) {
			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);
			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
			}
			unset($content);
			unset($deliver_content);




			//* Reconfigure postfix to use dovecot authentication
			// Adding the amavisd commands to the postfix configuration
			$postconf_commands = array (
			@@ -306,113 +397,127 @@
			'virtual_transport = dovecot',
			'smtpd_sasl_type = dovecot',
			'smtpd_sasl_path = private/auth',
			'receive_override_options = no_address_mappings'
			);


			// Make a backup copy of the main.cf file
			copy($conf["postfix"]["config_dir"].'/main.cf',$conf["postfix"]["config_dir"].'/main.cf~3');

			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");
			}


			//* backup dovecot.conf
			$configfile = 'dovecot.conf';
			if(is_file("$config_dir/$configfile")){
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			}

			//* Get the dovecot version
			exec('dovecot --version',$tmp);
			$parts = explode('.',trim($tmp[0]));
			$dovecot_version = $parts[0];
			unset($tmp);
			unset($parts);

			//* Copy dovecot configuration file
			if($dovecot_version == 2) {
			copy('tpl/fedora_dovecot2.conf.master',$config_dir.'/'.$configfile);
			} else {
			copy('tpl/fedora_dovecot.conf.master',$config_dir.'/'.$configfile);
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			}


			//* Get the dovecot version
			exec('dovecot --version', $tmp);
			$dovecot_version = $tmp[0];
			unset($tmp);

			//* Copy dovecot configuration file
			if(version_compare($dovecot_version,2) >= 0) {
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile);
			} else {
			copy('tpl/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile);
			}
			if(version_compare($dovecot_version,2.1) < 0) {
			removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
			}
			} else {
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master')) {
			copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master', $config_dir.'/'.$configfile);
			} else {
			copy('tpl/fedora_dovecot.conf.master', $config_dir.'/'.$configfile);
			}
			}

			//* dovecot-sql.conf
			$configfile = 'dovecot-sql.conf';
			if(is_file("$config_dir/$configfile")){
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			copy("$config_dir/$configfile", "$config_dir/$configfile~");
			exec("chmod 400 $config_dir/$configfile~");
			}
			}

			$content = rf("tpl/fedora_dovecot-sql.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_host}',$conf['mysql']['host'],$content);
			if(!@file_exists('/etc/dovecot-sql.conf')) exec('ln -s /etc/dovecot/dovecot-sql.conf /etc/dovecot-sql.conf');

			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot-sql.conf.master', "tpl/fedora_dovecot-sql.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_host}', $conf['mysql']['host'], $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");

			// Dovecot shall ignore mounts in website directory
			if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");

			}


			public function configure_amavis() {
			global $conf;


			// amavisd user config file
			$configfile = 'fedora_amavisd_conf';
			if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
			if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf', $conf["amavis"]["config_dir"].'/amavisd.conf~');
			if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.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_port}',$conf["mysql"]["port"],$content);
			$content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
			$content = str_replace('{hostname}',$conf['hostname'],$content);
			wf($conf["amavis"]["config_dir"].'/amavisd.conf',$content);


			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "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_port}', $conf["mysql"]["port"], $content);
			$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
			$content = str_replace('{hostname}', $conf['hostname'], $content);
			wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);


			// 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'
			);


			// Make a backup copy of the main.cf file
			copy($conf["postfix"]["config_dir"].'/main.cf',$conf["postfix"]["config_dir"].'/main.cf~2');

			copy($conf["postfix"]["config_dir"].'/main.cf', $conf["postfix"]["config_dir"].'/main.cf~2');

			// Executing the postconf commands
			foreach($postconf_commands as $cmd) {
			$command = "postconf -e '$cmd'";
			caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}


			// Append the configuration for amavisd to the master.cf file
			if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf',$conf["postfix"]["config_dir"].'/master.cf~');
			if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf', $conf["postfix"]["config_dir"].'/master.cf~');
			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
			// Only add the content if we had not addded it before
			if(!stristr($content,"127.0.0.1:10025")) {
			if(!stristr($content, "127.0.0.1:10025")) {
			unset($content);
			$content = rf("tpl/master_cf_amavis.master");
			af($conf["postfix"]["config_dir"].'/master.cf',$content);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', "tpl/master_cf_amavis.master");
			af($conf["postfix"]["config_dir"].'/master.cf', $content);
			}
			unset($content);

			removeLine('/etc/sysconfig/freshclam','FRESHCLAM_DELAY=disabled-warn # REMOVE ME',1);
			replaceLine('/etc/freshclam.conf','Example','# Example',1);


			removeLine('/etc/sysconfig/freshclam', 'FRESHCLAM_DELAY=disabled-warn # REMOVE ME', 1);
			replaceLine('/etc/freshclam.conf', 'Example', '# Example', 1);

			// Add the clamav user to the vscan group
			//exec('groupmod --add-user clamav vscan');




			}


			public function configure_spamassassin()
			{
			{
			global $conf;


			//* Enable spamasasssin on debian and ubuntu
			/*
			$configfile = '/etc/default/spamassassin';
			@@ -424,41 +529,41 @@
			wf($configfile, $content);
			*/
			}


			public function configure_getmail()
			{
			{
			global $conf;


			$config_dir = $conf['getmail']['config_dir'];


			if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));

			$command = "useradd -d $config_dir getmail";
			if(!is_user('getmail')) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			$command = "chown -R getmail $config_dir";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			$command = "chmod -R 700 $config_dir";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}




			public function configure_pureftpd()
			{
			{
			global $conf;


			$config_dir = $conf['pureftpd']['config_dir'];

			//* configure pam for SMTP authentication agains the ispconfig database
			$configfile = 'pureftpd-mysql.conf';
			if(is_file("$config_dir/$configfile")){
			copy("$config_dir/$configfile", "$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');
			exec("chmod 400 $config_dir/$configfile~");
			}
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/pureftpd_mysql.conf.master', '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);
			@@ -467,41 +572,45 @@
			wf("$config_dir/$configfile", $content);
			exec("chmod 600 $config_dir/$configfile");
			exec("chown root:root $config_dir/$configfile");


			// copy our customized copy of pureftpd.conf to the pure-ftpd config directory
			exec("cp tpl/fedora_pureftpd_conf.master $config_dir/pure-ftpd.conf");

			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_pureftpd_conf.master')) {
			exec("cp " . $conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_pureftpd_conf.master ' . "$config_dir/pure-ftpd.conf");
			}else {
			exec("cp tpl/fedora_pureftpd_conf.master $config_dir/pure-ftpd.conf");
			}

			}


			public function configure_mydns()
			{
			{
			global $conf;


			// configure mydns
			$configfile = 'mydns.conf';
			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)) 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}',$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);
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "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["mydns"]["config_dir"].'/'.$configfile, $content);
			exec('chmod 600 '.$conf["mydns"]["config_dir"].'/'.$configfile);
			exec('chown root:root '.$conf["mydns"]["config_dir"].'/'.$configfile);


			}


			public function configure_bind() {
			global $conf;


			// add the include line at the end of named.conf.
			replaceLine('/etc/named.conf','include "/etc/named.conf.local";','include "/etc/named.conf.local";',0,1);
			replaceLine('/etc/named.conf', 'include "/etc/named.conf.local";', 'include "/etc/named.conf.local";', 0, 1);

			//* Check if the zonefile directory has a slash at the end
			$content=$conf['bind']['bind_zonefiles_dir'];
			if(substr($content,-1,1) != '/') {
			if(substr($content, -1, 1) != '/') {
			$content .= '/';
			}

			@@ -513,41 +622,43 @@
			//* Chown the slave subdirectory to $conf['bind']['bind_user']
			exec('chown '.$conf['bind']['bind_user'].':'.$conf['bind']['bind_group'].' '.$content);
			exec('chmod 770 '.$content);


			}


			public function configure_apache()
			{
			{
			global $conf;


			if($conf['apache']['installed'] == false) return;
			if(is_file('/etc/suphp.conf')) {
			//replaceLine('/etc/suphp.conf','php=php:/usr/bin','x-httpd-suphp=php:/usr/bin/php-cgi',0);
			replaceLine('/etc/suphp.conf','docroot=','docroot=/var/www',0);
			replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0);
			replaceLine('/etc/suphp.conf', 'docroot=', 'docroot=/var/www', 0);
			replaceLine('/etc/suphp.conf', 'umask=0077', 'umask=0022', 0);
			}


			//* Create the logging directory for the vhost logfiles
			exec('mkdir -p /var/log/ispconfig/httpd');


			// Sites enabled and avaulable dirs
			exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']);
			exec('mkdir -p '.$conf['apache']['vhost_conf_dir']);


			$content = rf('/etc/httpd/conf/httpd.conf');
			if(!stristr($content,'Include /etc/httpd/conf/sites-enabled/')) {
			af('/etc/httpd/conf/httpd.conf',"\nNameVirtualHost :80\nNameVirtualHost :443\nInclude /etc/httpd/conf/sites-enabled/\n\n");
			if(!stristr($content, 'Include /etc/httpd/conf/sites-enabled/')) {
			af('/etc/httpd/conf/httpd.conf', "\nNameVirtualHost :80\nNameVirtualHost :443\nInclude /etc/httpd/conf/sites-enabled/\n\n");
			}
			unset($content);

			//* Copy the ISPConfig configuration include
			$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
			$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];

			// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
			$content = rf('tpl/apache_ispconfig.conf.master');
			$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");

			//* Copy the ISPConfig configuration include
			$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
			$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];

			$tpl = new tpl('apache_ispconfig.conf.master');
			$tpl->setVar('apache_version',getapacheversion());

			$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
			$ip_addresses = array();

			if(is_array($records) && count($records) > 0) {
			foreach($records as $rec) {
			if($rec['ip_type'] == 'IPv6') {
			@@ -555,145 +666,151 @@
			} else {
			$ip_address = $rec['ip_address'];
			}
			$ports = explode(',',$rec['virtualhost_port']);
			$ports = explode(',', $rec['virtualhost_port']);
			if(is_array($ports)) {
			foreach($ports as $port) {
			$port = intval($port);
			if($port > 0 && $port < 65536 && $ip_address != '') {
			$content .= 'NameVirtualHost '.$ip_address.":".$port."\n";
			$ip_addresses[] = array('ip_address' => $ip_address, 'port' => $port);
			}
			}
			}
			}
			}

			$content .= "\n";
			wf($vhost_conf_dir.'/ispconfig.conf',$content);

			if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);

			wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab());
			unset($tpl);

			if(!@is_link($vhost_conf_enabled_dir."/000-ispconfig.conf")) {
			exec("ln -s ".$vhost_conf_dir."/ispconfig.conf ".$vhost_conf_enabled_dir."/000-ispconfig.conf");
			}


			//* make sure that webalizer finds its config file when it is directly in /etc
			if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
			exec('mkdir /etc/webalizer');
			exec('ln -s /etc/webalizer.conf /etc/webalizer/webalizer.conf');
			}


			if(is_file('/etc/webalizer/webalizer.conf')) {
			// Change webalizer mode to incremental
			replaceLine('/etc/webalizer/webalizer.conf','#IncrementalName','IncrementalName webalizer.current',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental yes',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName webalizer.hist',0,0);
			replaceLine('/etc/webalizer/webalizer.conf', '#IncrementalName', 'IncrementalName webalizer.current', 0, 0);
			replaceLine('/etc/webalizer/webalizer.conf', '#Incremental', 'Incremental yes', 0, 0);
			replaceLine('/etc/webalizer/webalizer.conf', '#HistoryName', 'HistoryName webalizer.hist', 0, 0);
			}


			//* add a sshusers group
			$command = 'groupadd sshusers';
			if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			}


			public function configure_nginx(){
			global $conf;


			if($conf['nginx']['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);


			// Sites enabled and avaulable dirs
			exec('mkdir -p '.$conf['nginx']['vhost_conf_enabled_dir']);
			exec('mkdir -p '.$conf['nginx']['vhost_conf_dir']);

			wf('/etc/nginx/conf.d/ispconfig_vhosts.conf',"include /etc/nginx/sites-enabled/*.vhost;");
			wf('/etc/nginx/conf.d/ispconfig_vhosts.conf', "include /etc/nginx/sites-enabled/*.vhost;");

			//* 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');
			symlink('/etc/webalizer.conf','/etc/webalizer/webalizer.conf');
			symlink('/etc/webalizer.conf', '/etc/webalizer/webalizer.conf');
			}

			if(is_file('/etc/webalizer/webalizer.conf')) {
			// Change webalizer mode to incremental
			replaceLine('/etc/webalizer/webalizer.conf','#IncrementalName','IncrementalName webalizer.current',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental yes',0,0);
			replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName webalizer.hist',0,0);
			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);
			}


			// Check the awsatst script
			if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
			if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');
			if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local','LogFormat=4','LogFormat=1',0,1);

			if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl', '/usr/share/awstats/tools/awstats_buildstaticpages.pl');
			if(file_exists('/etc/awstats/awstats.conf.local')) replaceLine('/etc/awstats/awstats.conf.local', 'LogFormat=4', 'LogFormat=1', 0, 1);

			//* add a sshusers group
			$command = 'groupadd sshusers';
			if(!is_group('sshusers')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}


			public function configure_firewall()
			{
			global $conf;


			$dist_init_scripts = $conf['init_scripts'];


			if(is_dir("/etc/Bastille.backup")) caselog("rm -rf /etc/Bastille.backup", __FILE__, __LINE__);
			if(is_dir("/etc/Bastille")) caselog("mv -f /etc/Bastille /etc/Bastille.backup", __FILE__, __LINE__);
			@mkdir("/etc/Bastille", 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);
			@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__);
			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/bastille-firewall.cfg.master')) {
			caselog("cp -f " . $conf['ispconfig_install_dir']."/server/conf-custom/install/bastille-firewall.cfg.master /etc/Bastille/bastille-firewall.cfg", __FILE__, __LINE__);
			} else {
			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 = '';

			$tcp_public_services = '';
			$udp_public_services = '';

			$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.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 3306 8080 10000';
			$udp_public_services = '53';
			}

			if(trim($row["tcp_port"]) != '' \|\| trim($row["udp_port"]) != ''){
			$tcp_public_services = trim(str_replace(',', ' ', $row["tcp_port"]));
			$udp_public_services = trim(str_replace(',', ' ', $row["udp_port"]));
			} else {
			$tcp_public_services = '21 22 25 53 80 110 443 3306 8080 10000';
			$udp_public_services = '53';
			}
			if(!stristr($tcp_public_services, $conf['apache']['vhost_port'])) {
			$tcp_public_services .= ' '.intval($conf['apache']['vhost_port']);
			if($row["tcp_port"] != '') $this->db->query("UPDATE firewall SET tcp_port = tcp_port + ',".intval($conf['apache']['vhost_port'])."' WHERE server_id = ".intval($conf['server_id']));
			}

			$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
			$content = str_replace("{UDP_PUBLIC_SERVICES}", $udp_public_services, $content);

			wf("/etc/Bastille/bastille-firewall.cfg", $content);
			$content = str_replace("{TCP_PUBLIC_SERVICES}", $tcp_public_services, $content);
			$content = str_replace("{UDP_PUBLIC_SERVICES}", $udp_public_services, $content);

			if(is_file($dist_init_scripts."/bastille-firewall")) caselog("mv -f $dist_init_scripts/bastille-firewall $dist_init_scripts/bastille-firewall.backup", __FILE__, __LINE__);
			caselog("cp -f apps/bastille-firewall $dist_init_scripts", __FILE__, __LINE__);
			caselog("chmod 700 $dist_init_scripts/bastille-firewall", __FILE__, __LINE__);
			wf("/etc/Bastille/bastille-firewall.cfg", $content);

			if(is_file("/sbin/bastille-ipchains")) caselog("mv -f /sbin/bastille-ipchains /sbin/bastille-ipchains.backup", __FILE__, __LINE__);
			caselog("cp -f apps/bastille-ipchains /sbin", __FILE__, __LINE__);
			caselog("chmod 700 /sbin/bastille-ipchains", __FILE__, __LINE__);
			if(is_file($dist_init_scripts."/bastille-firewall")) caselog("mv -f $dist_init_scripts/bastille-firewall $dist_init_scripts/bastille-firewall.backup", __FILE__, __LINE__);
			caselog("cp -f apps/bastille-firewall $dist_init_scripts", __FILE__, __LINE__);
			caselog("chmod 700 $dist_init_scripts/bastille-firewall", __FILE__, __LINE__);

			if(is_file("/sbin/bastille-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-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);
			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()
			{
			{
			global $conf;


			$install_dir = $conf['ispconfig_install_dir'];

			//* Create the ISPConfig installation directory
			@@ -701,92 +818,119 @@
			$command = "mkdir $install_dir";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}


			//* Create a ISPConfig user and group
			$command = 'groupadd ispconfig';
			if(!is_group('ispconfig')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			$command = "useradd -g ispconfig -d $install_dir ispconfig";
			if(!is_user('ispconfig')) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			//* copy the ISPConfig interface part
			$command = "cp -rf ../interface $install_dir";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			//* copy the ISPConfig server part
			$command = "cp -rf ../server $install_dir";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* Make a backup of the security settings
			if(is_file('/usr/local/ispconfig/security/security_settings.ini')) copy('/usr/local/ispconfig/security/security_settings.ini','/usr/local/ispconfig/security/security_settings.ini~');

			//* copy the ISPConfig security part
			$command = 'cp -rf ../security '.$install_dir;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* Apply changed security_settings.ini values to new security_settings.ini file
			if(is_file('/usr/local/ispconfig/security/security_settings.ini~')) {
			$security_settings_old = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini~'));
			$security_settings_new = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
			if(is_array($security_settings_new) && is_array($security_settings_old)) {
			foreach($security_settings_new as $section => $sval) {
			if(is_array($sval)) {
			foreach($sval as $key => $val) {
			if(isset($security_settings_old[$section]) && isset($security_settings_old[$section][$key])) {
			$security_settings_new[$section][$key] = $security_settings_old[$section][$key];
			}
			}
			}
			}
			file_put_contents('/usr/local/ispconfig/security/security_settings.ini',array_to_ini($security_settings_new));
			}
			}

			//* Create a symlink, so ISPConfig is accessible via web
			// Replaced by a separate vhost definition for port 8080
			// $command = "ln -s $install_dir/interface/web/ /var/www/ispconfig";
			// caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			//* Create the config file for ISPConfig interface
			$configfile = 'config.inc.php';
			if(is_file($install_dir.'/interface/lib/'.$configfile)){
			copy("$install_dir/interface/lib/$configfile", "$install_dir/interface/lib/$configfile~");
			}
			$content = rf("tpl/$configfile.master");
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);

			$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
			$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
			$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
			$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);

			$content = str_replace('{server_id}', $conf['server_id'], $content);
			$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
			$content = str_replace('{language}', $conf['language'], $content);
			$content = str_replace('{timezone}', $conf['timezone'], $content);
			$content = str_replace('{theme}', $conf['theme'], $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");
			copy("$install_dir/interface/lib/$configfile", "$install_dir/interface/lib/$configfile~");
			}
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "tpl/$configfile.master");
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);


			$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
			$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
			$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
			$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);


			$content = str_replace('{server_id}', $conf['server_id'], $content);
			$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
			$content = str_replace('{language}', $conf['language'], $content);
			$content = str_replace('{timezone}', $conf['timezone'], $content);
			$content = str_replace('{theme}', $conf['theme'], $content);
			$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $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 = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "tpl/$configfile.master");
			$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
			$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
			$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
			$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);

			$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
			$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
			$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
			$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);

			$content = str_replace('{server_id}', $conf['server_id'], $content);
			$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
			$content = str_replace('{language}', $conf['language'], $content);
			$content = str_replace('{timezone}', $conf['timezone'], $content);
			$content = str_replace('{theme}', $conf['theme'], $content);
			$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);

			wf("$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.
			$dir = $install_dir.'/server/mods-available/';
			if (is_dir($dir)) {
			if ($dh = opendir($dir)) {
			while (($file = readdir($dh)) !== false) {
			if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
			include_once($install_dir.'/server/mods-available/'.$file);
			$module_name = substr($file,0,-8);
			if($file != '.' && $file != '..' && substr($file, -8, 8) == '.inc.php') {
			include_once $install_dir.'/server/mods-available/'.$file;
			$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);
			@@ -800,16 +944,16 @@
			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);
			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($tmp->onInstall()) {
			if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
			@@ -823,7 +967,7 @@
			closedir($dh);
			}
			}


			// Update the server config
			$mail_server_enabled = ($conf['services']['mail'])?1:0;
			$web_server_enabled = ($conf['services']['web'])?1:0;
			@@ -832,63 +976,96 @@
			$db_server_enabled = ($conf['services']['db'])?1:0;
			$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
			$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);


			if($conf['mysql']['master_slave_setup'] == 'y') {
			$this->dbmaster->query($sql);
			$this->db->query($sql);
			} else {
			$this->db->query($sql);
			}

			//* Chmod the files
			$command = "chmod -R 750 $install_dir";

			// chown install dir to root and chmod 755
			$command = 'chown root:root '.$install_dir;
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			$command = 'chmod 755 '.$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";
			//* Chmod the files and directories in the install dir
			$command = 'chmod -R 750 '.$install_dir.'/*';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the interface files to the ispconfig user and group
			$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the server files to the root user and group
			$command = 'chown -R root:root '.$install_dir.'/server';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the security files to the root user and group
			$command = 'chown -R root:root '.$install_dir.'/security';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* chown the security directory and security_settings.ini to root:ispconfig
			$command = 'chown root:ispconfig '.$install_dir.'/security/security_settings.ini';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			$command = 'chown root:ispconfig '.$install_dir.'/security';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			$command = 'chown root:ispconfig '.$install_dir.'/security/ids.whitelist';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			$command = 'chown root:ispconfig '.$install_dir.'/security/ids.htmlfield';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			$command = 'chown root:ispconfig '.$install_dir.'/security/apache_directives.blacklist';
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

			//* Make the global language file directory group writable
			exec("chmod -R 770 $install_dir/interface/lib/lang");


			//* Make the temp directory for language file exports writable
			exec("chmod -R 770 $install_dir/interface/web/temp");


			//* Make all interface language file directories group writable
			$handle = @opendir($install_dir.'/interface/web');
			while ($file = @readdir ($handle)) {
			if ($file != '.' && $file != '..') {
			if(@is_dir($install_dir.'/interface/web'.'/'.$file.'/lib/lang')) {
			while ($file = @readdir($handle)) {
			if ($file != '.' && $file != '..') {
			if(@is_dir($install_dir.'/interface/web'.'/'.$file.'/lib/lang')) {
			$handle2 = opendir($install_dir.'/interface/web'.'/'.$file.'/lib/lang');
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang',0770);
			while ($lang_file = @readdir ($handle2)) {
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang', 0770);
			while ($lang_file = @readdir($handle2)) {
			if ($lang_file != '.' && $lang_file != '..') {
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang/'.$lang_file,0770);
			chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang/'.$lang_file, 0770);
			}
			}
			}
			}
			}


			//* 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');


			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");
			}

			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'));
			}

			exec('chown -R root:root /usr/local/ispconfig/interface/ssl');

			// 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!
			@@ -904,78 +1081,92 @@
			$command = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			//if(is_user('ispapps')){
			// Allow the ispapps vhost access to /etc/squirrelmail
			//$command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
			//caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			// Allow the ispapps vhost access to /etc/squirrelmail
			//$command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
			//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
			$command = "chmod +x $install_dir/server/scripts/*.sh";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");


			if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
			//* Copy the ISPConfig vhost for the controlpanel
			// TODO: These are missing! should they be "vhost_dist_*_dir" ?
			$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);

			$tpl = new tpl('apache_ispconfig.vhost.master');
			$tpl->setVar('vhost_port',$conf['apache']['vhost_port']);

			// 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);
			$tpl->setVar('vhost_port_listen','#');
			} else {
			$content = str_replace('{vhost_port_listen}', '', $content);
			$tpl->setVar('vhost_port_listen','');
			}

			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);

			if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
			$tpl->setVar('ssl_comment','');
			} else {
			$content = str_replace('{ssl_comment}', '#', $content);
			$tpl->setVar('ssl_comment','#');
			}
			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);
			$tpl->setVar('ssl_bundle_comment','');
			} else {
			$content = str_replace('{ssl_bundle_comment}', '#', $content);
			$tpl->setVar('ssl_bundle_comment','#');
			}

			wf("$vhost_conf_dir/ispconfig.vhost", $content);


			$tpl->setVar('apache_version',getapacheversion());

			wf($vhost_conf_dir.'/ispconfig.vhost', $tpl->grab());

			//copy('tpl/apache_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")) {
			exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
			}

			//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")) {
			exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
			}

			/*
			exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
			exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
			exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
			exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
			exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');


			replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
			}
			*/
			//if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', '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);
			if(!is_dir('/var/www/php-fcgi-scripts/ispconfig')) exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
			wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
			exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
			if(!is_link('/var/www/ispconfig')) exec('ln -s /usr/local/ispconfig/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 = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/nginx_ispconfig.vhost.master', '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);
			@@ -985,22 +1176,22 @@
			$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(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 = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/php_fpm_pool.conf.master', '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);
			@@ -1013,120 +1204,123 @@
			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');
			symlink($vhost_conf_dir.'/ispconfig.vhost', $vhost_conf_enabled_dir.'/000-ispconfig.vhost');
			}
			}


			// create symlink from /usr/share/phpmyadmin to /usr/share/phpMyAdmin, if it is installed
			if(!@file_exists('/usr/share/phpmyadmin') && @is_dir('/usr/share/phpMyAdmin')) symlink('/usr/share/phpMyAdmin/','/usr/share/phpmyadmin');
			if(!@file_exists('/usr/share/phpmyadmin') && @is_dir('/usr/share/phpMyAdmin')) symlink('/usr/share/phpMyAdmin/', '/usr/share/phpmyadmin');
			}


			// Make the Clamav log files readable by ISPConfig
			//exec('chmod +r /var/log/clamav/clamav.log');
			//exec('chmod +r /var/log/clamav/freshclam.log');


			//* Install the update script
			if(is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
			exec('chown root /usr/local/ispconfig/server/scripts/update_from_svn.sh');
			exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_svn.sh');
			if(is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
			exec('chown root /usr/local/ispconfig/server/scripts/update_from_dev.sh');
			exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_dev.sh');
			exec('chown root /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
			exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
			exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
			exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
			if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
			if(!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_dev.sh');
			if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');


			// 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/maillog')) exec('chmod +r /var/log/maillog');
			//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');


			//To enable apache to read the directories
			// exec('chmod a+rx /usr/local/ispconfig');
			// exec('chmod -R 751 /usr/local/ispconfig/interface');
			// exec('chmod a+rx /usr/local/ispconfig/interface/web');


			//* 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');


			if(is_user('getmail')) {
			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');
			}


			// Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
			replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0);

			replaceLine('/etc/sudoers', 'Defaults requiretty', '#Defaults requiretty', 0, 0);

			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'));
			}


			//* 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');


			//* 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');

			// Add symlink for patch tool
			if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');

			}


			public function configure_dbserver()
			{
			global $conf;


			//* If this server shall act as database server for client DB's, we configure this here
			$install_dir = $conf['ispconfig_install_dir'];

			// Create a file with the database login details which

			// Create a file with the database login details which
			// are used to create the client databases.


			if(!is_dir("$install_dir/server/lib")) {
			$command = "mkdir $install_dir/server/lib";
			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
			}

			$content = rf("tpl/mysql_clientdb.conf.master");
			$content = str_replace('{hostname}',$conf['mysql']['host'],$content);
			$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);

			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mysql_clientdb.conf.master', "tpl/mysql_clientdb.conf.master");
			$content = str_replace('{hostname}', $conf['mysql']['host'], $content);
			$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');


			// remove existing ispconfig cronjobs, in case the syntax has changed
			foreach($existing_root_cron_jobs as $key => $val) {
			if(stristr($val,'/usr/local/ispconfig')) unset($existing_root_cron_jobs[$key]);
			if(stristr($val, '/usr/local/ispconfig')) unset($existing_root_cron_jobs[$key]);
			}


			$root_cron_jobs = array(
			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
			);


			if ($conf['nginx']['installed'] == true) {
			$root_cron_jobs[] = "0 0 * * * /usr/local/ispconfig/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
			}


			foreach($root_cron_jobs as $cron_job) {
			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
			$existing_root_cron_jobs[] = $cron_job."\n";
			@@ -1135,22 +1329,22 @@
			file_put_contents('crontab.txt', $existing_root_cron_jobs);
			exec('crontab -u root crontab.txt &> /dev/null');
			unlink('crontab.txt');


			//* Getmail crontab
			if(is_user('getmail')) {
			$cf = $conf['getmail'];
			$cf = $conf['getmail'];
			exec('crontab -u getmail -l > crontab.txt');
			$existing_cron_jobs = file('crontab.txt');


			$cron_jobs = array(
			'/5 * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
			);

			'/5 * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
			);

			// remove existing ispconfig cronjobs, in case the syntax has changed
			foreach($existing_cron_jobs as $key => $val) {
			if(stristr($val,'getmail')) unset($existing_cron_jobs[$key]);
			if(stristr($val, 'getmail')) unset($existing_cron_jobs[$key]);
			}


			foreach($cron_jobs as $cron_job) {
			if(!in_array($cron_job."\n", $existing_cron_jobs)) {
			$existing_cron_jobs[] = $cron_job."\n";
			@@ -1160,9 +1354,9 @@
			exec('crontab -u getmail crontab.txt &> /dev/null');
			unlink('crontab.txt');
			}


			exec('touch /var/log/ispconfig/cron.log');
			exec('chmod 666 /var/log/ispconfig/cron.log');
			exec('chmod 660 /var/log/ispconfig/cron.log');
			}

			}