From 30aa0891b8ef7204b899d90bf3757a5a1881d044 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 01 Nov 2007 16:54:45 -0400
Subject: [PATCH] - Enhanced the installation guides - added a daily cronjob for stats creation in the installer. - Fixed a bug in the spamfilter white / blacklist forms (thanks to satommy for reporting this) - fixed ssl cert path in vhost templates/web_domain_ssl.htm - fixed a bug in the apache plugin which prevented the copying of the standard error and index files.

---
 install/lib/installer_base.lib.php |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 51eaa38..fab5277 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -209,6 +209,9 @@
 
 		//* mysql-virtual_client.cf
         $this->process_postfix_config('mysql-virtual_client.cf');
+		
+		//* mysql-virtual_relaydomains.cf
+        $this->process_postfix_config('mysql-virtual_relaydomains.cf');
 
 		//* Changing mode and group of the new created config files.
 		caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
@@ -241,6 +244,7 @@
 			'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',
 			'virtual_create_maildirsize = yes',
 			'virtual_mailbox_extended = yes',
 			'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf',
@@ -484,6 +488,8 @@
 	public function configure_getmail()
     {
 		$config_dir = $this->conf['getmail']['config_dir'];
+		
+		if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
 
 		$command = "useradd -d $config_dir getmail";
 		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -518,7 +524,7 @@
 		exec("chmod 600 $config_dir/$configfile");
 		exec("chown root:root $config_dir/$configfile");
 		// **enable chrooting
-		exec('mkdir -p '.$config_dir.'/conf/ChrootEveryone');
+		//exec('mkdir -p '.$config_dir.'/conf/ChrootEveryone');
 		exec('echo "yes" > '.$config_dir.'/conf/ChrootEveryone');
 	}
 	
@@ -642,7 +648,10 @@
 		exec('crontab -u root -l > crontab.txt');
 		$existing_root_cron_jobs = file('crontab.txt');
 		
-		$root_cron_jobs = array('* * * * * /usr/bin/php -q /usr/local/ispconfig/server/server.php &> /dev/null');
+		$root_cron_jobs = array(
+			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
+			'30 00 * * * /usr/local/ispconfig/server/cron_daily.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";

--
Gitblit v1.9.1