aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/general-example11
1 files changed, 9 insertions, 2 deletions
diff --git a/conf/general-example b/conf/general-example
index e3e7e0be8..e9dcca18a 100644
--- a/conf/general-example
+++ b/conf/general-example
@@ -14,7 +14,7 @@
* Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
* Email: francis@mysociety.org; WWW: http://www.mysociety.org
*
- * $Id: general-example,v 1.17 2009-01-26 14:29:35 matthew Exp $
+ * $Id: general-example,v 1.18 2009-07-15 19:57:39 matthew Exp $
*
*/
@@ -32,7 +32,11 @@ define('OPTION_DRESS_DB_USER', 'dress');
define('OPTION_DRESS_DB_PASS', '');
define('OPTION_BASE_URL', 'http://www.example.org');
-define('OPTION_CONTACT_EMAIL', 'team@example.org');
+
+define('OPTION_EMAIL_DOMAIN', 'example.org');
+define('OPTION_CONTACT_EMAIL', 'team@'.OPTION_EMAIL_DOMAIN);
+define('OPTION_TEST_EMAIL_PREFIX', null);
+
define('OPTION_CONTACT_NAME', 'FixMyStreet');
define('OPTION_STAGING_SITE', 1);
@@ -59,4 +63,7 @@ define('OPTION_FLICKR_API', '');
define('OPTION_IPHONE_URL', '');
+// Log file (used in test harness, and later in admin scripts)
+define('OPTION_HTTPD_ERROR_LOG', '/var/log/apache/error.log');
+
?>