update paths

darcs-hash:20070115081444-5007d-3f39a313f1ae87cac97ce355fdf2e9e5a2588f1a.gz

diff --git a/src/org/ibex/mail/protocol/SMTP.java b/src/org/ibex/mail/protocol/SMTP.java
index b5ea75b..bca478b 100644 (file)
--- a/src/org/ibex/mail/protocol/SMTP.java
+++ b/src/org/ibex/mail/protocol/SMTP.java
@@ -19,8 +19,6 @@ import javax.naming.directory.*;
 // FIXME: loop prevention
 // FIXME: probably need some throttling on outbound mail
 
-// graylisting?
-
 // FEATURE: infer messageid, date, if not present (?)
 // FEATURE: exponential backoff on retry time?
 // FEATURE: RFC2822, section 4.5.1: special "postmaster" address
@@ -36,7 +34,7 @@ public class SMTP {
     public static final int GRAYLIST_MAXWAIT =  1000 * 60 * 60 * 24 * 5;  // five days
 
     public static final Graylist graylist =
-        new Graylist(Mailbox.STORAGE_ROOT+"/graylist.sqlite");
+        new Graylist(Mailbox.STORAGE_ROOT+"/db/graylist.sqlite");
 
     public static final int MAX_MESSAGE_SIZE =
         Integer.parseInt(System.getProperty("org.ibex.mail.smtp.maxMessageSize", "-1"));

diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index b7de2ed..98edcf7 100644 (file)
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -17,7 +17,7 @@ public class Script extends JS.Obj implements Target {
     private static final JS.Method METHOD = new JS.Method();
 
     private static Script root = null;
-    private static final String DEFAULT_CONF = File.separatorChar + "etc" + File.separatorChar + "org.ibex.mail.conf";
+    private static final String DEFAULT_CONF = Mailbox.STORAGE_ROOT + "conf" + File.separatorChar + "inbound.js";
     public static Script root() {
         try {
             if (root == null) root = new Script(System.getProperty("ibex.mail.conf", DEFAULT_CONF));