X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysconfig.h;h=871fdd11bb505a8aa06f19709d6b360d7fef7a77;hb=2f84905fd53640a922efc4bf30618e96776d8b49;hp=a58218bb6630f8172871cf5c5b242bbe4fb94e01;hpb=a66c3c97a6aeef2a4567f39fe08115782f641a58;p=citadel.git

diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h
index a58218bb6..871fdd11b 100644
--- a/citadel/sysconfig.h
+++ b/citadel/sysconfig.h
@@ -1,21 +1,17 @@
 /*
- * 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.
- */
-
-/*
- * If you want to keep a transcript of all multiuser chats that go across
- * your system, define CHATLOG to the filename to be saved to.  Otherwise,
- * set CHATLOG to "/dev/null".
- */
-#define CHATLOG		"/dev/null"
-
-/*
- * Logging level to use if none is specified on the command line.
- * Note that this will suppress messages before they even get to syslog().
+ * Tuning of various parameters of the system.
+ * Normally you don't want to mess with any of this.
+ *
+ * Copyright (c) 1987-2018 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.
  */
-#define DEFAULT_VERBOSITY	7
 
 /*
  * NLI is the string that shows up in a <W>ho's online listing for sessions
@@ -45,31 +41,21 @@
 #define BIGMSG		1024
 
 /*
- * SMTP delivery retry rules (all values are in seconds)
- *
- * If delivery of a message via SMTP is unsuccessful, Citadel will try again
- * after SMTP_RETRY_INTERVAL seconds.  This interval will double after each
- * unsuccessful delivery, up to a maximum of SMTP_RETRY_MAX seconds.  If no
- * successful delivery has been accomplished after SMTP_GIVE_UP seconds, the
- * message will be returned to its sender.
+ * SMTP delivery timeouts (measured in seconds)
+ * If outbound SMTP deliveries cannot be completed due to transient errors
+ * within SMTP_DELIVER_WARN seconds, the sender will receive a warning message
+ * indicating that the message has not yet been delivered but Citadel will
+ * keep trying.  After SMTP_DELIVER_FAIL seconds, Citadel will advise the
+ * sender that the deliveries have failed.
  */
-#define	SMTP_RETRY_INTERVAL	300	/* 5 minutes */
-#define SMTP_RETRY_MAX		43200	/* 12 hours */
-#define SMTP_GIVE_UP		432000	/* 5 days */
+#define SMTP_DELIVER_WARN	14400		// warn after four hours
+#define SMTP_DELIVER_FAIL	432000		// fail after five days
 
 /*
  * Who bounced messages appear to be from
  */
 #define BOUNCESOURCE		"Citadel Mail Delivery Subsystem"
 
-/*
- * This variable defines the amount of network spool data that may be carried
- * in one server transfer command.  For some reason, some networks get hung
- * up on larger packet sizes.  We don't know why.  In any case, never set the
- * packet size higher than 4096 or your server sessions will crash.
- */
-#define IGNET_PACKET_SIZE	4000
-
 /*
  * The names of rooms which are automatically created by the system
  */
@@ -87,8 +73,7 @@
 #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
@@ -99,9 +84,7 @@
 /*
  * How long (in seconds) to retain message entries in the use table
  */
-#define USETABLE_RETAIN			604800L		/* 7 days */
-#define USETABLE_ANTIEXPIRE     	345600l         /* 4 days */
-#define USETABLE_ANTIEXPIRE_HIRES	 86400l         /* 1 day */
+#define USETABLE_RETAIN		864000L		/* 10 days */
 
 /*
  * The size of per-thread stacks.  If set too low, citserver will randomly crash.