merge of '134ea580b291c807ad6e5ffe49e8525c1539cbb2'

and '7d1b1b8ef84e818ba107d3af4dd79c52c376205a'

Monotone-Parent: 134ea580b291c807ad6e5ffe49e8525c1539cbb2
Monotone-Parent: 7d1b1b8ef84e818ba107d3af4dd79c52c376205a
Monotone-Revision: d4b6685b33be650d23fc020ef3de5d203cb4557e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-10T17:42:37

Scripts/sogo.cron

@@ -0,0 +1,8 @@
+# Sogod cronjobs
+
+# Vacation messages expiration
+# Make sure to set authname and authpassword with the credentials of a sieve admin
+#0 0 * * *	sogo	/usr/sbin/sogo-tool expire-autoreply authname:authpassword
+
+# Email alarms - runs every minutes
+#* * * * *       sogo	/usr/sbin/sogo-ealarms-notify

debian/rules

@@ -43,6 +43,7 @@ install-arch: build-arch
 	cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo
 	mkdir -p debian/tmp/etc/apache2/conf.d
 	cp Apache/SOGo.conf debian/tmp/etc/apache2/conf.d/SOGo.conf
+	install -D -m 600 Scripts/sogo.cron debian/tmp/etc/cron.d/sogo
 
 # Build architecture dependant packages using the common target.
 binary-arch: build-arch install-arch
@@ -59,7 +60,7 @@ binary-arch: build-arch install-arch
 	dh_link
 	dh_strip --dbg-package=sogo-dbg
 	dh_compress
-	dh_fixperms
+	dh_fixperms -X/etc/cron.d/sogo
 	dh_makeshlibs
 	dh_shlibdeps
 	dh_installdeb

debian/sogo.install

@@ -1,5 +1,6 @@
 etc/default/sogo
 etc/apache2/conf.d/SOGo.conf
+etc/cron.d/sogo
 usr/sbin/*
 usr/lib/GNUstep/*
 usr/lib/lib*

sogo.spec

@@ -166,6 +166,7 @@ make DESTDIR=${RPM_BUILD_ROOT} \
      CC="$cc" LDFLAGS="$ldflags" \
      install
 mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
+mkdir -p ${RPM_BUILD_ROOT}/etc/cron.d
 mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily
 mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
 mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig
@@ -175,6 +176,7 @@ mkdir -p ${RPM_BUILD_ROOT}/var/run/sogo
 mkdir -p ${RPM_BUILD_ROOT}/var/log/sogo
 mkdir -p ${RPM_BUILD_ROOT}/var/spool/sogo
 cat Apache/SOGo.conf | sed -e "s@/lib/@/%{_lib}/@g" > ${RPM_BUILD_ROOT}/etc/httpd/conf.d/SOGo.conf
+install -m 600 Scripts/sogo.cron ${RPM_BUILD_ROOT}/etc/cron.d/sogo
 cp Scripts/tmpwatch ${RPM_BUILD_ROOT}/etc/cron.daily/sogo-tmpwatch
 chmod 755 ${RPM_BUILD_ROOT}/etc/cron.daily/sogo-tmpwatch
 cp Scripts/logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/sogo
@@ -222,6 +224,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/GNUstep/OCSTypeModels
 %{_libdir}/GNUstep/WOxElemBuilders-*
 
+%config(noreplace) %{_sysconfdir}/cron.d/sogo
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/SOGo.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/sogo
 %doc ChangeLog NEWS Scripts/sql-update-20070724.sh Scripts/sql-update-20070822.sh Scripts/sql-update-20080303.sh Scripts/sql-update-101_to_102.sh Scripts/sql-update-1.2.2_to_1.3.0.sh Scripts/sql-update-1.2.2_to_1.3.0-mysql.sh Scripts/sql-update-1.3.3_to_1.3.4.sh Scripts/sql-update-1.3.3_to_1.3.4-mysql.sh
@@ -299,6 +302,9 @@ fi
 
 # ********************************* changelog *************************
 %changelog
+* Tue Jan 10 2012 Jean Raby <jraby@inverse.ca>
+- /etc/cron.d/sogo
+
 * Thu Oct 27 2011 Wolfgang Sourdeau <wsourdeau@inverse.ca>
 - make build of sogo-openchange-backend conditional to sogo_version >= 2