From 89e4554cb0bbf4b515f1e9f4ec6d48d0a95706c5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 26 Sep 2010 09:36:55 -0400
Subject: [PATCH] Merged revisions 1917-2036 from trunk.

---
 install/dist/conf/debian40.conf.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php
index e2b2952..a4ba76b 100644
--- a/install/dist/conf/debian40.conf.php
+++ b/install/dist/conf/debian40.conf.php
@@ -37,11 +37,11 @@
 $conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
 $conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
 $conf['ispconfig_log_priority'] = 2;  // 0 = Debug, 1 = Warning, 2 = Error
+$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
 $conf['server_id'] = 1;
 $conf['init_scripts'] = '/etc/init.d';
 $conf['runlevel'] = '/etc';
 $conf['shells'] = '/etc/shells';
-$conf['cron_tab'] = '/var/spool/cron/crontabs/root';
 $conf['pam'] = '/etc/pam.d';
 
 //* Services provided by this server, this selection will be overridden by the expert mode
@@ -125,11 +125,11 @@
 $conf['courier']['courier-imap-ssl'] = 'courier-imap-ssl';
 $conf['courier']['courier-pop'] = 'courier-pop';
 $conf['courier']['courier-pop-ssl'] = 'courier-pop-ssl';
-$conf['dovecot']['init_script'] = 'dovecot';
 
 //* Dovecot
 $conf['dovecot']['installed'] = false; // will be detected automatically during installation
 $conf['dovecot']['config_dir'] = '/etc/dovecot';
+$conf['dovecot']['init_script'] = 'dovecot';
 
 //* SASL
 $conf['saslauthd']['installed'] = false; // will be detected automatically during installation
@@ -186,4 +186,4 @@
 $conf['cron']['crontab_dir'] = '/etc/cron.d';
 $conf['cron']['wget'] = '/usr/bin/wget';
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1