From 531767cfbbc6e580b5d6fc60b64a41e7787359713f3a36771c3ba4789909dc8c Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sun, 22 Sep 2019 20:48:46 +0000
Subject: [PATCH] Accepting request 732541 from home:wrosenauer:devel

see changes

OBS-URL: https://build.opensuse.org/request/show/732541
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/munin?expand=0&rev=53
---
 munin-cron.service |  7 ++++
 munin-cron.timer   |  9 +++++
 munin.changes      |  7 ++++
 munin.spec         | 98 +++++++++++++++++-----------------------------
 4 files changed, 59 insertions(+), 62 deletions(-)
 create mode 100644 munin-cron.service
 create mode 100644 munin-cron.timer

diff --git a/munin-cron.service b/munin-cron.service
new file mode 100644
index 0000000..cf5f598
--- /dev/null
+++ b/munin-cron.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Collect node data
+Documentation=man:munin-cron(8)
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/munin-cron
diff --git a/munin-cron.timer b/munin-cron.timer
new file mode 100644
index 0000000..3c25dea
--- /dev/null
+++ b/munin-cron.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Collect data from nodes
+Documentation=man:munin-cron(8) man:munin(8)
+
+[Timer]
+OnCalendar=*:0/5
+
+[Install]
+WantedBy=timers.target
diff --git a/munin.changes b/munin.changes
index 2c9db17..44b74d3 100644
--- a/munin.changes
+++ b/munin.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 10 10:11:38 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- use systemd timer instead of cron for new distributions (boo#1115448)
+- require perl-rrdtool (boo#1149880)
+- removed old (non-systemd) conditionals from spec
+
 -------------------------------------------------------------------
 Tue Aug 20 11:53:15 CEST 2019 - kukuk@suse.de
 
diff --git a/munin.spec b/munin.spec
index 037be33..185d1c2 100644
--- a/munin.spec
+++ b/munin.spec
@@ -45,6 +45,8 @@ Source11:       munin-cgi-html.service
 Source12:       nginx-munin.zip
 # https://github.com/ifad/gsa-munin/archive/master.zip
 Source13:       gsa-munin.zip
+Source14:       munin-cron.timer
+Source15:       munin-cron.service
 Patch1:         perl526.patch
 BuildRequires:  html2text
 BuildRequires:  perl-HTML-Template
@@ -55,14 +57,9 @@ BuildRequires:  perl-Net-Server
 BuildRequires:  pwdutils
 BuildRequires:  unzip
 BuildRequires:  perl(Module::Build)
-%if 0%{?suse_version} >= 1220
 %{?systemd_requires}
 BuildRequires:  htmldoc
 BuildRequires:  pkgconfig(systemd)
-%else
-BuildRequires:  sysvinit
-Requires(pre):  %insserv_prereq
-%endif
 Requires:       perl-Date-Manip
 Requires:       perl-FastCGI
 Requires:       perl-File-Copy-Recursive
@@ -74,14 +71,15 @@ Requires:       perl-Net-SSLeay
 Requires:       perl-Net-Server
 Requires:       perl-URI
 Requires:       perl-base = %{perl_version}
+Requires:       perl-rrdtool
 Requires:       pwdutils
 Requires:       rrdtool
 Requires:       spawn-fcgi
 Requires:       perl(Munin::Common::Defaults)
-%if 0%{?suse_version} > 1320
-Requires:       perl-rrdtool
+Recommends:     logrotate
+%if 0%{?suse_version} <= 1510
+Recommends:     cron
 %endif
-Recommends:     logrotate cron
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -119,15 +117,9 @@ Requires:       sysstat
 # manual requires from certain plugins using "env ..."
 Requires:       python
 Requires:       ruby
-%if 0%{?suse_version} >= 1220
 %{?systemd_requires}
-%else
-Requires(pre):  %insserv_prereq
-%endif
-%if 0%{?suse_version} >= 1330
-Requires(pre):       group(nobody)
-Requires(pre):       user(nobody)
-%endif
+Requires(pre):  group(nobody)
+Requires(pre):  user(nobody)
 Recommends:     logrotate
 BuildArch:      noarch
 
@@ -169,9 +161,6 @@ unzip %{SOURCE13}
 %__mkdir_p %{buildroot}/%{_sysconfdir}/munin/plugins
 %__mkdir_p %{buildroot}/%{_sysconfdir}/munin/munin-conf.d
 
-%__mkdir_p %{buildroot}/%{_sysconfdir}/cron.d
-%__install -m0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/cron.d/munin
-
 %__mkdir_p %{buildroot}/etc/logrotate.d
 %__install -m0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/logrotate.d/munin
 %__install -m0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/munin-node
@@ -179,17 +168,10 @@ unzip %{SOURCE13}
 %__install -m0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/munin/plugin-conf.d/munin-node
 
 %__mkdir_p %{buildroot}/sbin
-%if 0%{?suse_version} < 1220
-%__mkdir_p %{buildroot}/%{_sysconfdir}/init.d
-%__install -m0755 %{SOURCE2} %{buildroot}/%{_sysconfdir}/init.d/munin-node
-%__ln_s %{_sysconfdir}/init.d/munin-node $RPM_BUILD_ROOT/sbin/rcmunin-node
-%else
 %__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-node
 %__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-cgi-graph
 %__ln_s /sbin/service $RPM_BUILD_ROOT/sbin/rcmunin-cgi-html
-%endif
 
-%if 0%{?suse_version} >= 1220
 %__mkdir_p %{buildroot}/%{_prefix}/lib/tmpfiles.d
 %__install -m0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/tmpfiles.d/munin.conf
 %__install -m0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/tmpfiles.d/munin-node.conf
@@ -197,6 +179,12 @@ unzip %{SOURCE13}
 %__install -m0644 %{SOURCE9} %{buildroot}/%{_unitdir}/munin-node.service
 %__install -m0644 %{SOURCE10} %{buildroot}/%{_unitdir}/munin-cgi-graph.service
 %__install -m0644 %{SOURCE11} %{buildroot}/%{_unitdir}/munin-cgi-html.service
+%if 0%{?suse_version} > 1510
+%__install -m0644 %{SOURCE14} %{buildroot}/%{_unitdir}/
+%__install -m0644 %{SOURCE15} %{buildroot}/%{_unitdir}/
+%else
+%__mkdir_p %{buildroot}/%{_sysconfdir}/cron.d
+%__install -m0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/cron.d/munin
 %endif
 
 %__mkdir_p %{buildroot}/%{logdir}
@@ -216,9 +204,11 @@ ln munin-gsa-master/README.md README.gsa
 %pre
 getent group munin >/dev/null || /usr/sbin/groupadd -r munin
 getent passwd munin > /dev/null || /usr/sbin/useradd -r -c "munin monitoring" -d %{dbdir} -g munin munin
-%if 0%{?suse_version} >= 1220
 %service_add_pre munin-cgi-graph.service
 %service_add_pre munin-cgi-html.service
+%if 0%{?suse_version} > 1510
+%service_add_pre munin-cron.timer
+%service_add_pre munin-cron.service
 %endif
 
 %post
@@ -228,68 +218,59 @@ chmod 755 %{dbdir}
 touch %{logdir}/munin-graph.log %{logdir}/munin-html.log %{logdir}/munin-nagios.log %{logdir}/munin-limits.log %{logdir}/munin-update.log
 chown munin:munin %{logdir}/*
 chown root:root %{logdir}/munin-node.log* >/dev/null 2>&1 || true
-%if 0%{?suse_version} >= 1220
 systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin.conf
 %service_add_post munin-cgi-graph.service
 %service_add_post munin-cgi-html.service
+%if 0%{?suse_version} > 1510
+%service_add_post munin-cron.timer
+%service_add_post munin-cron.service
+# update from cron based release
+if [ -f  %{_sysconfdir}/cron.d/munin ]; then
+  systemctl enable munin-cron.timer || :
+  systemctl start munin-cron.timer || :
+fi
 %endif
 
 %preun
-%if 0%{?suse_version} >= 1220
 %service_del_preun munin-cgi-graph.service
 %service_del_preun munin-cgi-html.service
+%if 0%{?suse_version} > 1510
+%service_del_preun munin-cron.timer
+%service_del_preun munin-cron.service
 %endif
 
 %postun
-%if 0%{?suse_version} >= 1220
 %service_del_postun munin-cgi-graph.service
 %service_del_postun munin-cgi-html.service
+%if 0%{?suse_version} > 1510
+%service_del_postun munin-cron.timer
+%service_del_postun munin-cron.service
 %endif
 
 ## Node
 %pre node
 getent group munin >/dev/null || /usr/sbin/groupadd -r munin
 getent passwd munin > /dev/null || /usr/sbin/useradd -r -c "munin monitoring" -d %{dbdir} -g munin munin
-%if 0%{?suse_version} >= 1220
 %service_add_pre munin-node.service
-%endif
 
 %post node
 if [ $1 = 1 ]; then
 /usr/sbin/munin-node-configure --shell | sh
 fi
-%if 0%{?suse_version} < 1220
-%fillup_and_insserv -f -y munin-node
-%endif
 chown -R munin:munin %{dbdir}
 chmod 755 %{dbdir}
 touch %{logdir}/munin-node.log
 chown munin:munin %{logdir}/*
 chown root:root %{logdir}/munin-node.log*
 chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
-%if 0%{?suse_version} >= 1220
 %tmpfiles_create /usr/lib/tmpfiles.d/munin-node.conf
 %service_add_post munin-node.service
-%else
-%if 0%{?active_by_default} > 0
-/etc/init.d/munin-node status >/dev/null 2>&1 || /etc/init.d/munin-node start
-%endif
-%endif
 
 %preun node
-%if 0%{?suse_version} >= 1220
 %service_del_preun munin-node.service
-%else
-%stop_on_removal munin-node
-%endif
 
 %postun node
-%if 0%{?suse_version} >= 1220
 %service_del_postun munin-node.service
-%else
-%restart_on_update munin-node
-%{insserv_cleanup}
-%endif
 
 %files
 %defattr(-, root, root)
@@ -309,12 +290,16 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %{_prefix}/lib/munin/DejaVuSansMono.ttf
 %{cgidir}/munin-cgi-graph
 %{cgidir}/munin-cgi-html
-%if 0%{?suse_version} >= 1220
 %{_prefix}/lib/tmpfiles.d/munin.conf
 %{_unitdir}/munin-cgi-graph.service
 %{_unitdir}/munin-cgi-html.service
 /sbin/rcmunin-cgi-graph
 /sbin/rcmunin-cgi-html
+%if 0%{?suse_version} > 1510
+%{_unitdir}/munin-cron.*
+%else
+%dir %{_sysconfdir}/cron.d
+%config %{_sysconfdir}/cron.d/munin
 %endif
 %attr(0755, munin, munin) %dir %{htmldir}
 %attr(0444, munin, munin) %{htmldir}/.htaccess
@@ -324,8 +309,6 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %dir %{_sysconfdir}/munin/static
 %config %{_sysconfdir}/munin/templates/*
 %config %{_sysconfdir}/munin/static/*
-%dir %{_sysconfdir}/cron.d
-%config %{_sysconfdir}/cron.d/munin
 %config(noreplace) %{_sysconfdir}/munin/munin.conf
 %config %{_sysconfdir}/logrotate.d/munin
 %dir %{perl_vendorlib}/Munin
@@ -369,9 +352,7 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %{_mandir}/man8/munin.8.gz
 %attr(0750, munin, munin) %dir %{logdir}
 %attr(0755, munin, munin) %dir %{dbdir}
-%if 0%{?suse_version} >= 1330
 %ghost /run/munin
-%endif
 
 %files node
 %defattr(-, root, root)
@@ -379,18 +360,13 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %{_sbindir}/munin-run
 %{_sbindir}/munin-node
 %{_sbindir}/munin-node-configure
-%if 0%{?suse_version} >= 1220
 %{_prefix}/lib/tmpfiles.d/munin-node.conf
 %{_unitdir}/munin-node.service
-%endif
 %dir %{_prefix}/lib/munin
 %{_prefix}/lib/munin/munin-async
 %{_prefix}/lib/munin/munin-asyncd
 %{_prefix}/lib/munin/plugins/
 /sbin/rcmunin-node
-%if 0%{?suse_version} < 1220
-%config %{_sysconfdir}/init.d/munin-node
-%endif
 %dir %{_sysconfdir}/munin/plugin-conf.d
 %dir %{_sysconfdir}/munin/plugins
 %config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/munin-node
@@ -457,8 +433,6 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %attr(0750, munin, munin) %dir %{logdir}
 %attr(0755, munin, munin) %dir %{dbdir}
 %attr(0775, nobody, nobody) %dir %{dbdir}/plugin-state
-%if 0%{?suse_version} >= 1330
 %ghost /run/munin
-%endif
 
 %changelog