From e499ca72c70181d06b5a630148d3018b3f2dca34 Mon Sep 17 00:00:00 2001 From: Hubbitus Date: Thu, 24 Apr 2014 20:14:37 +0400 Subject: [PATCH] - Do not mark man ad %%doc. - Add systemd stuff. - Provide separate user for service. --- SOURCES/darkstat.service | 11 +++++++++++ SOURCES/darkstat.sysconfig | 3 +++ SPECS/darkstat.spec | 36 +++++++++++++++++++++++++++++++++--- 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 SOURCES/darkstat.service create mode 100644 SOURCES/darkstat.sysconfig diff --git a/SOURCES/darkstat.service b/SOURCES/darkstat.service new file mode 100644 index 0000000..049fe62 --- /dev/null +++ b/SOURCES/darkstat.service @@ -0,0 +1,11 @@ +[Unit] +Description=Network traffic analyzer +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=-/etc/sysconfig/darkstat +ExecStart=/usr/sbin/darkstat $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/SOURCES/darkstat.sysconfig b/SOURCES/darkstat.sysconfig new file mode 100644 index 0000000..395bad5 --- /dev/null +++ b/SOURCES/darkstat.sysconfig @@ -0,0 +1,3 @@ +# As base only specify network interface is mandatory. +# For more options see man darkstat +OPTIONS="-i p10p1" diff --git a/SPECS/darkstat.spec b/SPECS/darkstat.spec index 92380c0..a72361c 100644 --- a/SPECS/darkstat.spec +++ b/SPECS/darkstat.spec @@ -1,14 +1,21 @@ Name: darkstat Summary: Network traffic analyzer Version: 3.0.718 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet URL: http://unix4lyfe.org/darkstat/ Source: http://unix4lyfe.org/%{name}/%{name}-%{version}.tar.bz2 - +# My own systemd files +Source1: %{name}.service +Source2: %{name}.sysconfig BuildRequires: libpcap-devel, zlib-devel +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +BuildRequires: systemd + %description darkstat is a network traffic analyzer. It's basically a packet sniffer which runs as a background process on a cable/DSL router and gathers @@ -24,12 +31,35 @@ make %{?_smp_mflags} %install make install DESTDIR="%{buildroot}" +install -Dp -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service +install -Dp -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/%{name} + +%pre +getent passwd %{name} >/dev/null || useradd -r -s /sbin/nologin -c "Network traffic analyzer" %{name} +exit 0 + +%post +%systemd_post %{name}.service + +%preun +%systemd_preun %{name}.service + +%postun +%systemd_postun_with_restart %{name}.service + %files %doc AUTHORS COPYING* LICENSE NEWS README *.txt -%doc %{_mandir}/man8/darkstat.8* +%{_mandir}/man8/darkstat.8* %attr(755,-,-) %{_sbindir}/darkstat +%attr(0600,%{name},root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%{_unitdir}/%{name}.service %changelog +* Thu Apr 24 2014 Pavel Alexeev - - 3.0.718-2 +- Do not mark man ad %%doc. +- Add systemd stuff. +- Provide separate user for service. + * Fri Mar 14 2014 Pavel Alexeev - 3.0.718-1 - Imported from http://pkgs.repoforge.org/darkstat/darkstat-3.0.717-1.rf.src.rpm and rework to prepare for Fedora. - Update to 3.0.718.