Switch to systemd.timer. Remove cron dependency

6 files changed, 39 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09f7f7087617..30c474ee4648 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = squidanalyzer
 	pkgdesc = Squid proxy native log analyser and reports generator
 	pkgver = 6.6
-	pkgrel = 5
+	pkgrel = 6
 	url = http://squidanalyzer.darold.net/
+	install = squidanalyzer.install
 	arch = any
 	license = GPL
-	depends = cron
 	depends = perl
 	options = !emptydirs
 	options = purge
@@ -15,10 +15,12 @@ pkgbase = squidanalyzer
 	backup = etc/squidanalyzer/squidanalyzer.conf
 	backup = etc/squidanalyzer/user-aliases
 	source = http://downloads.sourceforge.net/project/squid-report/squid-report/6.6/squidanalyzer-6.6.tar.gz
-	source = squidanalyzer.cron
+	source = squidanalyzer.service
+	source = squidanalyzer.timer
 	source = daterange.patch
 	md5sums = d70f5c747d0666a92410fdca734c494b
-	md5sums = e8c2657f7a2eb544d6c246f5eca02e8b
+	md5sums = ce973423ada4ddcde5a512c511e425a8
+	md5sums = 9b554dfa2aad2ff210f18f2bc599660c
 	md5sums = 6849c57c38774b2c115f5421c7a3fd4f
 
 pkgname = squidanalyzer
diff --git a/PKGBUILD b/PKGBUILD
index 95cec8ccbc27..8771b9570361 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,21 @@
 
 pkgname=squidanalyzer
 pkgver=6.6
-pkgrel=5
+pkgrel=6
 pkgdesc="Squid proxy native log analyser and reports generator"
 arch=('any')
 url='http://squidanalyzer.darold.net/'
 license=('GPL')
 options=('!emptydirs' 'purge')
-depends=('cron' 'perl')
+depends=('perl')
 source=("http://downloads.sourceforge.net/project/squid-report/squid-report/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}.cron"
-	daterange.patch
+        'squidanalyzer.service'
+        'squidanalyzer.timer'
+        'daterange.patch'
        )
 md5sums=('d70f5c747d0666a92410fdca734c494b'
-         'e8c2657f7a2eb544d6c246f5eca02e8b'
+         'ce973423ada4ddcde5a512c511e425a8'
+         '9b554dfa2aad2ff210f18f2bc599660c'
          '6849c57c38774b2c115f5421c7a3fd4f')
 backup=(
     'etc/squidanalyzer/excluded'
@@ -23,6 +25,7 @@ backup=(
     'etc/squidanalyzer/squidanalyzer.conf'
     'etc/squidanalyzer/user-aliases'
     )
+install=squidanalyzer.install
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -58,6 +61,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   unset PERL5LIB PERL_MM_OPT PERL_LOCAL_LIB_ROOT
   make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
-  install -dm755 "${pkgdir}"/etc/cron.daily
-  install -Dm700 ../${pkgname}.cron "${pkgdir}"/etc/cron.daily/${pkgname}
+  install -Dm644 -t "${pkgdir}"/usr/lib/systemd/system ../squidanalyzer.{service,timer}
 }
diff --git a/squidanalyzer.cron b/squidanalyzer.cron
deleted file mode 100644
index ae86dc25d9f1..000000000000
--- a/squidanalyzer.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/squid-analyzer > /dev/null 2>&1
diff --git a/squidanalyzer.install b/squidanalyzer.install
new file mode 100644
index 000000000000..d77edb40f33c
--- /dev/null
+++ b/squidanalyzer.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+  if (( $(vercmp $2 6.6-6) < 0)); then
+    systemctl --now enable squidanalyzer.timer
+  fi
+}
diff --git a/squidanalyzer.service b/squidanalyzer.service
new file mode 100644
index 000000000000..37e8e8f62665
--- /dev/null
+++ b/squidanalyzer.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Squid log anayzer
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/squid-analyzer
+StandardOutput=null
+StandardError=null
diff --git a/squidanalyzer.timer b/squidanalyzer.timer
new file mode 100644
index 000000000000..633f91396f12
--- /dev/null
+++ b/squidanalyzer.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Squid log anayzer
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+RandomizedDelaySec=1h
+
+[Install]
+WantedBy=timers.target