From f329159b33cdbe836b503cfe10aafbd123d14359 Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Sat, 31 Dec 2016 14:28:06 +0100
Subject: [PATCH] added piler.cron to $datarootdir

Change-Id: I41ce251c96c0d414e397f0532c7a06efbc7641b6
Signed-off-by: SJ <sj@acts.hu>
---
 etc/Makefile.in  |  5 +++++
 etc/cron.jobs.in | 24 +++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 2cacee32..746a74e7 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -34,6 +34,11 @@ install:
 	if [ ! -f "$(DESTDIR)$(sysconfdir)/piler/piler.conf" ]; then $(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler/piler.conf; fi
 	sed -e 's%LOCALSTATEDIR%$(localstatedir)%g' $(srcdir)/sphinx.conf.in > sphinx.conf.dist
 	$(INSTALL) -m 0644 -g $(RUNNING_GROUP) $(srcdir)/sphinx.conf.dist $(DESTDIR)$(sysconfdir)/piler/sphinx.conf.dist
+	$(INSTALL) -m 0644 -g $(RUNNING_GROUP) $(srcdir)/cron.jobs.in $(DESTDIR)$(datarootdir)/piler/piler.cron
+	sed -i -e 's%LOCALSTATEDIR%$(localstatedir)%g' $(DESTDIR)$(datarootdir)/piler/piler.cron
+	sed -i -e 's%LIBEXECDIR%$(libexecdir)%g' $(DESTDIR)$(datarootdir)/piler/piler.cron
+	sed -i -e 's%BINDIR%$(bindir)%g' $(DESTDIR)$(datarootdir)/piler/piler.cron
+	sed -i -e 's%SYSCONFDIR%$(sysconfdir)%g' $(DESTDIR)$(datarootdir)/piler/piler.cron
 
 clean:
 	rm -f piler.conf cron.jobs sphinx.conf.dist
diff --git a/etc/cron.jobs.in b/etc/cron.jobs.in
index 4104dacb..15c18b83 100644
--- a/etc/cron.jobs.in
+++ b/etc/cron.jobs.in
@@ -1,25 +1,19 @@
-#########################################################
-###     all the cron jobs you may need for piler      ###
-### be sure to review it and adjust it for your needs ###
-#########################################################
-
-piler's crontab:
-
-### mandatory
-
+### PILERSTART
 5,35 * * * * LIBEXECDIR/piler/indexer.delta.sh
 30   2 * * * LIBEXECDIR/piler/indexer.main.sh
-*/15 * * * * /usr/local/bin/indexer --quiet tag1 --rotate
-*/15 * * * * /usr/local/bin/indexer --quiet note1 --rotate
-*/5 * * * *  /usr/bin/find /srv/www/webui.yourdomain.com/tmp -type f -name i.\* -exec rm -f {} \;
+15,45 * * * * LIBEXECDIR/piler/indexer.attachment.sh
+*/15 * * * * /usr/bin/indexer --config SYSCONFDIR/piler/sphinx.conf --quiet tag1 --rotate
+*/15 * * * * /usr/bin/indexer --config SYSCONFDIR/piler/sphinx.conf --quiet note1 --rotate
+*/5 * * * *  /usr/bin/find LOCALSTATEDIR/piler/www/tmp -type f -name i.\* -exec rm -f {} \;
 
 ### optional: the same report you can see on the health page
-30 7 * * * /usr/bin/php LIBEXECDIR/piler/daily-report.php --webui /srv/www/webui.yourdomain.com
+###30 7 * * * /usr/bin/php LIBEXECDIR/piler/daily-report.php --webui LOCALSTATEDIR/piler/www
 
 ### optional: populate accouting data
-30 6 * * * /usr/bin/php LIBEXECDIR/piler/generate_stats.php --webui /srv/www/webui.yourdomain.com
+###30 6 * * * /usr/bin/php LIBEXECDIR/piler/generate_stats.php --webui LOCALSTATEDIR/piler/www
 
 ### optional: purge aged emails
-2 0 * * * /usr/local/bin/pilerpurge
+###2 0 * * * BINDIR/pilerpurge
 
 
+### PILEREND