* Default expire policy is now 'manual' (no automatic expiry of messages

  under any circumstances).  Implemented as per David Given's suggestion
  that we should operate using the element of least surprise.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3a4efc7ed153baa8fae04f3dfed5a9213dd7e166..c7e7c1643d2301422522a0a93df17ac682ced0b6 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 647.1  2005/05/16 16:59:39  ajc
+ * Default expire policy is now 'manual' (no automatic expiry of messages
+   under any circumstances).  Implemented as per David Given's suggestion
+   that we should operate using the element of least surprise.
+
  Revision 647.0  2005/05/12 16:54:10  ajc
  * THIS IS 6.47
 
@@ -6679,3 +6684,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/docs/citadel.html b/citadel/docs/citadel.html
index f556e97160908b3d4616de59d7d7e97207527345..1530cee0bac17172c13f6ef60919a8ed627cd444 100644 (file)
--- a/citadel/docs/citadel.html
+++ b/citadel/docs/citadel.html
@@ -1304,6 +1304,11 @@ messages around forever (or until they are manually deleted), until
 they become a certain number of days old, or until a certain number of
 additional messages are posted in the room, at which time the oldest
 ones will scroll out.</p>
+<p>When a new Citadel system is first installed, the default system-wide
+expire policy is set to 'manual' -- no automatic purging of messages
+takes place anywhere.  For public message boards, you will probably want
+to set some sort of automatic expire policy, in order to prevent your
+message base from growing forever.</p>
 <p>You will notice that you can also fall back to the default expire
 policy for the floor upon which the room resides. This is the default
 setting. You can change the floor's default with the <tt><b>;A</b>ide <b>E</b>dit

diff --git a/citadel/setup.c b/citadel/setup.c
index 6c8b336da7c508971b633c98c52110e25cb897b5..410c76ec81eca07b116da334a46bfe520b894fc3 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1075,10 +1075,11 @@ int main(int argc, char *argv[])
        }
        /* We need a system default message expiry policy, because this is
         * the top level and there's no 'higher' policy to fall back on.
+        * By default, do not expire messages at all.
         */
        if (config.c_ep.expire_mode == 0) {
-               config.c_ep.expire_mode = EXPIRE_NUMMSGS;
-               config.c_ep.expire_value = 150;
+               config.c_ep.expire_mode = EXPIRE_MANUAL;
+               config.c_ep.expire_value = 0;
        }
 
        /*