From 0a08285facce833fecba8319c4f0b2bdf641746e Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Thu, 11 Apr 2013 10:09:02 -0400 Subject: [PATCH] Add note regarding precedence of .GNUstepDefaults --- Scripts/sogo.conf | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/Scripts/sogo.conf b/Scripts/sogo.conf index c05ddf2cc..caff050a6 100644 --- a/Scripts/sogo.conf +++ b/Scripts/sogo.conf @@ -1,15 +1,19 @@ { - /* ******************** Main SOGo configuration file ******************** - * - * This is a dictionary in OpenStep property list format. - * See the Installation Guide for details on the format. - * - * C and C++ style comments are supported - * - * This example configuration contains only a subset of all available - * configuration parameters. Please see the installation guide more details. - * - */ + /* ********************* Main SOGo configuration file ********************** + * * + * Since the content of this file is a dictionary in OpenStep plist format, * + * the curly braces enclosing the body of the configuration are mandatory. * + * See the Installation Guide for details on the format. * + * * + * C and C++ style comments are supported. * + * * + * This example configuration contains only a subset of all available * + * configuration parameters. Please see the installation guide more details. * + * * + * ~sogo/GNUstep/Defaults/.GNUstepDefaults has precedence over this file, * + * make sure to move it away to avoid unwanted parameter overrides. * + * * + * **************************************************************************/ /* Database configuration (mysql:// or postgresql://) */ //SOGoProfileURL = "postgresql://sogo:sogo@localhost:5432/sogo/sogo_user_profile"; @@ -54,13 +58,13 @@ //); /* SQL authentication example */ - /* These database columns MUST be present in the view/table: - * c_uid - will be used for authentication - it's the username or username@domain.tld) - * c_name - which can be identical to c_uid - will be used to uniquely identify entries - * c_password - password of the user, plain-text, md5 or sha encoded for now - * c_cn - the user's common name - such as "John Doe" - * mail - the user's mail address - * See the installation guide for more details + /* These database columns MUST be present in the view/table: + * c_uid - will be used for authentication - it's the username or username@domain.tld) + * c_name - which can be identical to c_uid - will be used to uniquely identify entries + * c_password - password of the user, plain-text, md5 or sha encoded for now + * c_cn - the user's common name - such as "John Doe" + * mail - the user's mail address + * See the installation guide for more details */ //SOGoUserSources = // ( @@ -99,5 +103,4 @@ //SOGoUIxDebugEnabled = YES; //WODontZipResponse = YES; //WOLogFile = /var/log/sogo/sogo.log; - }