From 5619c7dd99b674af0922e29ccfd00d58a08979c5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 15 Jul 2010 08:36:47 -0400
Subject: [PATCH] Fixed: FS#1229 - ISPConfig3 creates the desired e-mail domain twice (on master server AND on the selected Slave)
---
install/tpl/config.inc.php.master | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index c5a2d52..68fd74f 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,7 +1,6 @@
<?php
-
/*
-Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2010, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -114,7 +113,7 @@
//** Interface
-define('ISPC_INTERFACE_MODULES_ENABLED', 'dashboard,mail,sites,dns,tools');
+$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';
//** Logging
@@ -151,4 +150,9 @@
define("LOGLEVEL_WARN",1);
define("LOGLEVEL_ERROR",2);
+//** include a local config-file if there is one
+//** IMPORTANT!!!
+//** DO NOT MAKE A COPY OF THIS FILE AS LOCAL CONFIG-FILE
+//** USE A EMPTY FILE AND ONLY COPY THE SETTINGS IN IT, YOU NEED TO OVERRIDE
+if (is_file(dirname(__FILE__) . '/config.inc.local.php')) include_once 'config.inc.local.php';
?>
--
Gitblit v1.9.1