Changes - j0ke.net Open Build Service

Changes of Revision 47

[-] [+]	Changed	munin.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Nov 30 15:40:43 UTC 2014 - cs@linux-administrator.com + +- Add munin-node.service file for distributions which support it + +------------------------------------------------------------------- Sat Nov 29 12:45:42 UTC 2014 - cs@linux-administrator.com - Update to release 2.0.25
[-] [+]	Changed	munin.spec ^
@@ -27,6 +27,7 @@ Source6: munin-node.cron.d Source7: plugins.conf Source8: munin-vhost.template +Source9: munin-node.service Requires: perl-HTML-Template perl-Log-Log4perl perl(Getopt::Long) >= 2.37 rrdtool logrotate cron Requires: perl(Net::SSLeay) @@ -175,7 +176,11 @@ sed -i s@"%{buildroot}"@""@g %{buildroot}%{perl_vendorlib}/Munin/Common/Defaults.pm %{buildroot}%{_docdir}/munin/resources/crontab-generic-munin install -d %{buildroot}%{_docdir}/munin +%if 0%{?rhel} >= 7 \|\| 0%{?sles_version} >= 12 \|\| 0%{?suse_version} >= 1230 +install -m0644 -D %{SOURCE9} %{buildroot}/usr/lib/systemd/system/munin-node.service +%else install -m0755 -D %{SOURCE2} %{buildroot}/etc/init.d/munin-node +%endif install -m0644 -D %{SOURCE3} %{buildroot}/etc/cron.d/munin install -m0644 -D %{SOURCE4} %{buildroot}/etc/logrotate.d/munin install -m0644 %{SOURCE5} %{buildroot}/etc/logrotate.d/munin-node @@ -213,7 +218,12 @@ %post node if [ $1 = 1 ] then - /sbin/chkconfig --add munin-node + %if 0%{?rhel} >= 7 \|\| 0%{?sles_version} >= 12 \|\| 0%{?suse_version} >= 1230 + systemctl enable munin-node + + %else + /sbin/chkconfig --add munin-node + %endif /usr/sbin/munin-node-configure --shell \| sh fi %{fillup_and_insserv -n -y munin munin-node} @@ -227,9 +237,14 @@ %preun node if [ $1 = 0 ] then - /sbin/service munin-node stop > /dev/null 2>&1 - /sbin/chkconfig --del munin-node - rmdir %{logdir} 2>/dev/null \|\| true + %if 0%{?rhel} >= 7 \|\| 0%{?sles_version} >= 12 \|\| 0%{?suse_version} >= 1230 + systemctl stop munin-node + systemctl disable munin-node + %else + /sbin/service munin-node stop > /dev/null 2>&1 + /sbin/chkconfig --del munin-node + rmdir %{logdir} 2>/dev/null \|\| true + %endif fi %stop_on_removal munin-node @@ -306,10 +321,14 @@ %{_sbindir}/munin-node %{_sbindir}/munin-node-configure %{_datadir}/munin/plugins/* -/sbin/rcmunin-node %config(noreplace) %{confdir}/munin-node.conf %config(noreplace) %{confdir}/plugin-conf.d/munin-node +%if 0%{?rhel} >= 7 \|\| 0%{?sles_version} >= 12 \|\| 0%{?suse_version} >= 1230 +/usr/lib/systemd/system/munin-node.service +%else %config /etc/init.d/munin-node +/sbin/rcmunin-node +%endif %config /etc/cron.d/munin-node %config /etc/logrotate.d/munin-node %dir %{confdir}/plugins
[-] [+]	Added	munin-graph.service ^
@@ -0,0 +1,11 @@ +[Unit] +Description=Munin FastCGI Graph +Requires=munin-graph.socket + +[Service] +User=munin +Group=munin +ExecStart=/usr/share/munin/cgi/munin-cgi-graph +StandardInput=socket +StandardOutput=inherit +StandardError=journal
[-] [+]	Added	munin-html.service ^
@@ -0,0 +1,11 @@ +[Unit] +Description=Munin FastCGI HTML +Requires=munin-html.socket + +[Service] +User=munin +Group=munin +ExecStart=/usr/share/munin/cgi/munin-cgi-html +StandardInput=socket +StandardOutput=inherit +StandardError=journal
[-] [+]	Added	munin-node.service ^
@@ -0,0 +1,11 @@ +[Unit] +Description=Munin Node Service +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/munin/munin-node.pid +ExecStart=/usr/bin/munin-node + +[Install] +WantedBy=multi-user.target