[D-community-commits] r212 - trunk/fai-config-dir/scripts/MAILSERVER

[holger at alioth.debian.org]

Author: holger
Date: 2008-01-12 23:14:02 +0000 (Sat, 12 Jan 2008)
New Revision: 212

Modified:
   trunk/fai-config-dir/scripts/MAILSERVER/40-misc
   trunk/fai-config-dir/scripts/MAILSERVER/50-cyrus
Log:
- disable nntp in cyrus.conf
- use --quiet instead of redirecting to /dev/null


Modified: trunk/fai-config-dir/scripts/MAILSERVER/40-misc
===================================================================
--- trunk/fai-config-dir/scripts/MAILSERVER/40-misc	2008-01-12 23:04:17 UTC (rev 211)
+++ trunk/fai-config-dir/scripts/MAILSERVER/40-misc	2008-01-12 23:14:02 UTC (rev 212)
@@ -11,5 +11,6 @@
     # enable sieve scripts
     { ${target}/etc/cyrus.conf
         ReplaceAll 'listen="localhost:sieve"' With 'listen="sieve"'
+	CommentLinesMatching ".*nntp.*"
     }
 

Modified: trunk/fai-config-dir/scripts/MAILSERVER/50-cyrus
===================================================================
--- trunk/fai-config-dir/scripts/MAILSERVER/50-cyrus	2008-01-12 23:04:17 UTC (rev 211)
+++ trunk/fai-config-dir/scripts/MAILSERVER/50-cyrus	2008-01-12 23:14:02 UTC (rev 212)
@@ -2,12 +2,12 @@
 
 fcopy -M /etc/imapd.conf
 
-if ! grep lmtp $target/etc/group >/dev/null; then
+if ! grep -q lmtp $target/etc/group ; then
     $ROOTCMD addgroup --system lmtp
     $ROOTCMD adduser postfix lmtp
     $ROOTCMD /etc/init.d/postfix/restart
 fi   
 
 $ROOTCMD dpkg-statoverride --force --update --add cyrus lmtp 750 /var/run/cyrus/socket
-$ROOTCMD adduser cyrus ssl-cert > /dev/null
+$ROOTCMD adduser --quiet cyrus ssl-cert 
 $ROOTCMD /etc/init.d/cyrus2.2 restart