Changeset 4f7cda5 for npl/mailserver/netqmail_conf/root

Timestamp:

04/25/18 20:56:16 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

gcc484, master, perl-5.22

Children:

4d0b1ea

Parents:

b26e5aa

Message:

upgrade to netqmail 1.06 with Roberto Puzzanghera's patch (​http://notes.sagredo.eu/en/qmail-notes-185/patching-qmail-82.html)

Location:

npl/mailserver/netqmail_conf/root

Files:

• etc/postinst.d/post.qmail_conf (added)
• etc/qmail (added)
• etc/qmail.permissions (added)
• etc/qmail.rc.config (moved) (moved from npl/mailserver/netqmail/qmail.rc.config)
• home/system/qmail/alias/.qmail-default (added)
• home/system/qmail/control/concurrencyincoming.new (added)
• home/system/qmail/control/defaultdomain.new (added)
• home/system/qmail/control/locals (added)
• home/system/qmail/control/qmqpservers.new (added)
• home/system/qmail/control/rcpthosts.new (added)
• home/system/qmail/control/virtualdomains.new (added)
• home/system/qmail/queue/lock/sendmutex (added)
• home/system/qmail/queue/lock/tcpto (added)
• home/system/qmail/tcp.smtp.new (added)
• home/system/qmail/users/assign.new (added)
• service/qmail-send (added)
• service/qmail-smtpd (added)
• usr/bin/syn3-dagent (moved) (moved from npl/mailserver/netqmail/syn3-dagent) (2 diffs)
• var/qmail/alias (added)
• var/qmail/bin/qmailctl (added)
• var/qmail/control (added)
• var/qmail/queue (added)
• var/qmail/rc (added)
• var/qmail/supervise/qmail-send/log/run (added)
• var/qmail/supervise/qmail-send/run (added)
• var/qmail/supervise/qmail-smtpd/log/run (added)
• var/qmail/supervise/qmail-smtpd/run (added)
• var/qmail/users (added)

npl/mailserver/netqmail_conf/root/usr/bin/syn3-dagent

@@ -45 +45 @@
 fi
 
-#check cyrus is up, and deliver it there:
-if /usr/bin/pgrep -f -x /usr/cyrus/bin/master ; then
-        if [ "$SPAM" ]; then
-                /usr/cyrus/bin/deliver -a "$USER" -m Spam "$USER" < $MAIL
-                end $?
-        else
-                /usr/cyrus/bin/deliver -a "$USER" "$USER" < $MAIL
-                end $?
-        fi
-fi
+# #check cyrus is up, and deliver it there:
+# if /usr/bin/pgrep -f -x /usr/cyrus/bin/master ; then
+#       if [ "$SPAM" ]; then
+#               /usr/cyrus/bin/deliver -a "$USER" -m Spam "$USER" < $MAIL
+#               end $?
+#       else
+#               /usr/cyrus/bin/deliver -a "$USER" "$USER" < $MAIL
+#               end $?
+#       fi
+# fi
 
 #check zarafa is up, and deliver it there:
@@ -67 +67 @@
 fi
 
+#check kopano is up, and deliver it there:
+if pidof kopano-server >/dev/null; then
+        if [ "$SPAM" ]; then
+                /usr/bin/kopano-dagent "$USER" -q -j < $MAIL
+                end $?
+        else
+                /usr/bin/kopano-dagent "$USER" -q < $MAIL
+                end $?
+        fi
+fi
+
 #no backend mailstorage up, so fail temporary
 echo "All mailbackends are down, retry again later..."