Fix incoming mail spool directory

onak-mail has spooled incoming mail for a long time; fix up the default
config to put this in spool/onak rather than the hardcoded /community
that was previously configured.

diff --git a/debian/onak.dirs b/debian/onak.dirs
index e39d490b5ba55af4cc5fc99cc44a3aef5b1b07cd..1f344662f6dc79216f8d8d12bc98835f0ebdd376 100644 (file)
--- a/debian/onak.dirs
+++ b/debian/onak.dirs
@@ -1 +1,2 @@
 var/lib/onak
 var/lib/onak

+var/spool/onak

diff --git a/onak.conf.in b/onak.conf.in
index d9c307965b871e428258175db4dca31bac780cc6..e1b2c4f8ba071329c8f414517e734947a1164318 100644 (file)
--- a/onak.conf.in
+++ b/onak.conf.in
@@ -30,7 +30,7 @@ mail_delivery_client /usr/sbin/sendmail -t -oi -fmailer-daemon
 maintainer_email PGP Key Server Administrator <pgp-keyserver-admin@the.earth.li>
 mail_intro_file /community/pgp-keyserver/share/mail_intro
 help_dir /community/pgp-keyserver/share
 maintainer_email PGP Key Server Administrator <pgp-keyserver-admin@the.earth.li>
 mail_intro_file /community/pgp-keyserver/share/mail_intro
 help_dir /community/pgp-keyserver/share

-mail_dir /community/pgp-keyserver/incoming
+mail_dir @STATEDIR@/spool/onak

 
 ### If you change this, make sure to put a corresponding help file in
 ### the help_dir named above
 
 ### If you change this, make sure to put a corresponding help file in
 ### the help_dir named above