X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysconfig.h;h=5af00b02318b1ae0da8dd621ec95f950b175a10f;hb=986d5323ec0c189efd573558c02ae13573ec7536;hp=545ddfee16a4139b471a83c3bf0ccab8aa49c562;hpb=1755118cd22db26151ef9fff730a9f6f25b96619;p=citadel.git

diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h
index 545ddfee1..5af00b023 100644
--- a/citadel/sysconfig.h
+++ b/citadel/sysconfig.h
@@ -1,23 +1,16 @@
 /*
- * $Id$
+ * Tuning of various parameters of the system.
+ * Normally you don't want to mess with any of this.
  *
- */
-
-/****************************************************************************/
-/*                  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, 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,
- * not this file.
+ * Copyright (c) 1987-2017 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 /*
@@ -27,22 +20,12 @@
  */
 #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().
  */
 #define DEFAULT_VERBOSITY	7
 
-
-
 /*
  * NLI is the string that shows up in a <W>ho's online listing for sessions
  * that are active, but for which no user has yet authenticated.
@@ -79,7 +62,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 */
 
@@ -108,11 +91,12 @@
 #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 DELETED_MSGS_ROOM	"__CitadelDeletedMessages__"
-
+#define FNBL_QUEUE_ROOM		"__CitadelFNBLqueue__"
 /*
  * 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
@@ -120,18 +104,20 @@
  */
 #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 */
 
 /*
- * Pathnames for cryptographic goodness
+ * The size of per-thread stacks.  If set too low, citserver will randomly crash.
  */
-#define	CTDL_CRYPTO_DIR		"./keys"
-#define CTDL_KEY_PATH		CTDL_CRYPTO_DIR "/citadel.key"
-#define CTDL_CSR_PATH		CTDL_CRYPTO_DIR "/citadel.csr"
-#define CTDL_CER_PATH		CTDL_CRYPTO_DIR "/citadel.cer"
+#define THREADSTACKSIZE		0x100000
 
-#define THREADSTACKSIZE		1048576
+/*
+ * How many messages may the full text indexer scan before flushing its
+ * tables to disk?
+ */
+#define FT_MAX_CACHE		2500