cleanup fsl, socket access, log rotation

imapd/fsl.imapd

@@ -26,3 +26,27 @@ ident .*(pop3d/.+) q{
     }
 };
 
+ident .*(lmtpd/.+) q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/imapd/log/lmtpd.log",
+            append=1, perm=0644
+        )
+    }
+};
+
+ident .*(master/.+) q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/imapd/log/master.log",
+            append=1, perm=0644
+        )
+    }
+};
+

imapd/imapd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Mail
 License:      BSD
 Version:      2.1.12
-Release:      20030411
+Release:      20030414
 
 #   package options
 %option       with_vhost_hack  no
@@ -197,9 +197,10 @@ Provides:     IMAP
         '%config %{l_prefix}/etc/imapd/cyrus.conf' \
         '%config %{l_prefix}/etc/fsl/fsl.imapd' \
         '%not %dir %{l_prefix}/etc/fsl' \
-        '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd' \
+        '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/imapd' \
         '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*' \
-        '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*/*'
+        '%dir %attr(0770,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*/*' \
+        '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/imapd/socket'
 
 %files -f files
 

imapd/rc.imapd

@@ -12,7 +12,6 @@
     imapd_log_complevel="9"
     pop_type="cyrus"
     pop_logfile="@l_prefix@/var/imapd/log/pop3d.log"
-    imap_logfile="@l_prefix@/var/imapd/log/pop3d.log"
 
 %start -p 200 -u @l_susr@
     opServiceEnabled imapd || exit 0
@@ -48,6 +47,5 @@
         -z${imapd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
         -P "${imapd_log_prolog}" \
         -E "${imapd_log_epilog}" \
-        $pop_logfile \
-        $imap_logfile
+        @l_prefix@/var/imapd/log/*.log