X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysconfig.h;h=f0c9bd2be6b9ad30db6f2fec6d34235710d55731;hb=42147eb1950e0c616b070a8676603b551b1d9c58;hp=9c6d6610a12ff3b7e4143bac3985fa779ac9d7d2;hpb=0a8905501ce1b06263d34ddb69ab1a5f64e8c3dc;p=citadel.git

diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h
index 9c6d6610a..f0c9bd2be 100644
--- a/citadel/sysconfig.h
+++ b/citadel/sysconfig.h
@@ -1,19 +1,3 @@
-/*
- * $Id$
- *
- */
-
-/****************************************************************************/
-/*                  YOUR SYSTEM CONFIGURATION                               */
-/* Set all the values in this file appropriately BEFORE compiling any of the*/
-/* C programs. If you are upgrading from an older version of Citadel/UX, it */
-/* is vitally important that the #defines which are labelled "structure size*/
-/* variables" are EXACTLY the same as they were in your old system,         */
-/* otherwise your files will be munged beyond repair.                       */
-/****************************************************************************/
-
-/* $Id$ */
-
 /*
  * NOTE: this file is for client software tuning, not customization.  For
  * making changes to the behavior of the client, you want to edit citadel.rc,
@@ -27,34 +11,11 @@
  */
 #define CHATLOG		"/dev/null"
 
-/* 
- * S_KEEPALIVE is a watchdog timer.  It is used to send "keep
- * alive" messages to the server to prevent the server from assuming the
- * client is dead and terminating the session.  30 seconds is the recommended
- * value; I can't think of any good reason to change it.
- */
-#define S_KEEPALIVE	30
-
-/*
- * This is the command that gets executed when a user hits <E>nter message:
- * presses the <E>nter message key.  The possible values are:
- *   4  - .<E>nter <M>essage
- *   46 - .<E>nter message with <E>ditor
- *   36 - .<E>nter message with <A>scii
- * Normally, this value will be set to 4, to cause the <E>nter message
- * command to run Citadel's built-in editor.  However, if you have an external
- * editor installed, and you want to make it the default, set this to 46
- * to make it use your editor by default.
- */
-#define DEFAULT_ENTRY		4
-
-
 /*
  * Logging level to use if none is specified on the command line.
+ * Note that this will suppress messages before they even get to syslog().
  */
-#define DEFAULT_VERBOSITY	9
-
-
+#define DEFAULT_VERBOSITY	7
 
 /*
  * NLI is the string that shows up in a <W>ho's online listing for sessions
@@ -77,6 +38,12 @@
  */
 #define SIZ		4096
 
+/*
+ * If the body of a message is beyond this size, it will be stored in
+ * a separate table.
+ */
+#define BIGMSG		1024
+
 /*
  * SMTP delivery retry rules (all values are in seconds)
  *
@@ -86,7 +53,7 @@
  * successful delivery has been accomplished after SMTP_GIVE_UP seconds, the
  * message will be returned to its sender.
  */
-#define	SMTP_RETRY_INTERVAL	900	/* 15 minutes */
+#define	SMTP_RETRY_INTERVAL	300	/* 5 minutes */
 #define SMTP_RETRY_MAX		43200	/* 12 hours */
 #define SMTP_GIVE_UP		432000	/* 5 days */
 
@@ -113,11 +80,36 @@
 #define USERCONFIGROOM		"My Citadel Config"
 #define USERCALENDARROOM	"Calendar"
 #define USERTASKSROOM		"Tasks"
+#define USERCONTACTSROOM	"Contacts"
+#define USERNOTESROOM		"Notes"
+#define USERDRAFTROOM		"Drafts"
+#define USERTRASHROOM		"Trash"
 #define PAGELOGROOM		"Sent/Received Pages"
 #define SYSCONFIGROOM		"Local System Configuration"
 #define SMTP_SPOOLOUT_ROOM	"__CitadelSMTPspoolout__"
+#define FNBL_QUEUE_ROOM		"__CitadelFNBLqueue__"
+#define PAGER_QUEUE_ROOM	"__CitadelPagerQueue__"
+/*
+ * Where we keep messages containing the vCards that source our directory.  It
+ * makes no sense to change this, because you'd have to change it on every
+ * system on the network.  That would be stupid.
+ */
+#define ADDRESS_BOOK_ROOM	"Global Address Book"
 
 /*
  * How long (in seconds) to retain message entries in the use table
  */
-#define USETABLE_RETAIN		604800L		/* 7 days */
+#define USETABLE_RETAIN			864000L		/* 10 days */
+#define USETABLE_ANTIEXPIRE     	345600l         /*  4 days */
+#define USETABLE_ANTIEXPIRE_HIRES	 86400l         /*  1 day */
+
+/*
+ * The size of per-thread stacks.  If set too low, citserver will randomly crash.
+ */
+#define THREADSTACKSIZE		0x100000
+
+/*
+ * How many messages may the full text indexer scan before flushing its
+ * tables to disk?
+ */
+#define FT_MAX_CACHE		2500