Changeset a39aa4c for npl/mailserver/netqmail_conf/root/usr/bin/syn3-dagent

Timestamp:

05/17/18 15:00:08 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

b4abfab

Parents:

94ad01e (diff), f690de8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'gcc483'

File:

• npl/mailserver/netqmail_conf/root/usr/bin/syn3-dagent (moved) (moved from npl/mailserver/netqmail/syn3-dagent) (2 diffs)

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..."