X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysconfig.h;h=f0c9bd2be6b9ad30db6f2fec6d34235710d55731;hb=42147eb1950e0c616b070a8676603b551b1d9c58;hp=1be1aa59640715fed20e71f7662af7975e6656d9;hpb=12129e7b9fa3598570481bca06a4895d94be4d3b;p=citadel.git

diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h
index 1be1aa596..f0c9bd2be 100644
--- a/citadel/sysconfig.h
+++ b/citadel/sysconfig.h
@@ -1,6 +1,4 @@
 /*
- * $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,
  * not this file.
@@ -13,14 +11,6 @@
  */
 #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
-
 /*
  * Logging level to use if none is specified on the command line.
  * Note that this will suppress messages before they even get to syslog().
@@ -63,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 */
 
@@ -92,12 +82,13 @@
 #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
@@ -108,12 +99,14 @@
 /*
  * 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		1048576
+#define THREADSTACKSIZE		0x100000
 
 /*
  * How many messages may the full text indexer scan before flushing its