From 9fdd47a27b39ee9f8fa577acaefbca65e2b7edbd Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 11 Dec 2013 13:49:24 +0100
Subject: [PATCH] Really fix qmail-notify cron

---
 createlinks                                                      | 4 ++++
 ipasserelle-base.spec                                            | 1 -
 root/etc/e-smith/templates.metadata/etc/cron.hourly/qmail-notify | 1 +
 root/etc/e-smith/templates/etc/cron.hourly/qmail-notify/10All    | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 root/etc/e-smith/templates.metadata/etc/cron.hourly/qmail-notify
 create mode 100644 root/etc/e-smith/templates/etc/cron.hourly/qmail-notify/10All

diff --git a/createlinks b/createlinks
index 8c28406..041914f 100644
--- a/createlinks
+++ b/createlinks
@@ -26,6 +26,10 @@ foreach my $event (qw/ipasserelle-update bootstrap-ldap-save/){
     event_link("private-cacert", "$event", "25");
 }
 
+# Activation de qmail-notify
+safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/etc/cron.hourly/qmail-notify/template-begin");
+templates2events("/etc/cron.hourly/qmail-notify", qw(email-update bootstrap-console-save));
+
 # Desactivation des checks RAID
 templates2events("/etc/sysconfig/raid-check", qw(ipasserelle-update bootstrap-console-save));
 
diff --git a/ipasserelle-base.spec b/ipasserelle-base.spec
index 5278718..77a5dac 100644
--- a/ipasserelle-base.spec
+++ b/ipasserelle-base.spec
@@ -288,7 +288,6 @@ perl createlinks
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
    --file /etc/cron.hourly/qpsmtpd-cleanup 'attr(0755,root,root)' \
    --file /etc/cron.monthly/maillog-rotate 'attr(0755,root,root)' \
-   --file /etc/cron.hourly/qmail-notify 'attr(0755,root,root)' \
    --file /etc/cron.hourly/cacrl 'attr(0755,root,root)' \
    --file /etc/cron.daily/purge-homes-recycle 'attr(0755,root,root)' \
    --file /etc/cron.daily/download-updates 'attr(0755,root,root)' \
diff --git a/root/etc/e-smith/templates.metadata/etc/cron.hourly/qmail-notify b/root/etc/e-smith/templates.metadata/etc/cron.hourly/qmail-notify
new file mode 100644
index 0000000..6bbf39b
--- /dev/null
+++ b/root/etc/e-smith/templates.metadata/etc/cron.hourly/qmail-notify
@@ -0,0 +1 @@
+PERMS=0755
diff --git a/root/etc/e-smith/templates/etc/cron.hourly/qmail-notify/10All b/root/etc/e-smith/templates/etc/cron.hourly/qmail-notify/10All
new file mode 100644
index 0000000..5d491d0
--- /dev/null
+++ b/root/etc/e-smith/templates/etc/cron.hourly/qmail-notify/10All
@@ -0,0 +1 @@
+exec qmail-notify -r -m -f /var/qmail/control/queuenotifymsg