rpms/clamav
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made script in -scanner-systemd an instance of clamd@.service

Browse Source
This commit is contained in:
Enrico Scholz 2012-01-08 11:56:49 +01:00
parent 09cf83a8cf
commit ff790d3534
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clamav.spec
View File

@ -209,9 +209,10 @@ Requires(preun): /sbin/initctl
%package scanner-systemd %package scanner-systemd
Summary: Systemd initscripts for clamav scanner daemon Summary: Systemd initscripts for clamav scanner daemon
Group: System Environment/Daemons Group: System Environment/Daemons
Source430: clamd.scan.systemd Source430: clamd@scan.service
Provides: init(clamav-scanner) = systemd Provides: init(clamav-scanner) = systemd
Requires: clamav-scanner = %version-%release Requires: clamav-scanner = %version-%release
Requires: clamav-server-systemd = %version-%release
%{?systemd_reqs} %{?systemd_reqs}
%{?noarch} %{?noarch}
@ -530,7 +531,7 @@ sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \
> $RPM_BUILD_ROOT%_initrddir/clamd.scan > $RPM_BUILD_ROOT%_initrddir/clamd.scan
install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf
install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd@scan.service
cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf
d %scanstatedir 0710 %scanuser %scanuser d %scanstatedir 0710 %scanuser %scanuser
@ -630,7 +631,7 @@ test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || :
test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : test "$1" != "0" || /sbin/initctl -q stop clamd.scan || :
%systemd_install scanner-systemd clamd.scan.service %systemd_install scanner-systemd clamd@scan.service
%post update %post update
@ -808,7 +809,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
%if 0%{?with_systemd:1} %if 0%{?with_systemd:1}
%files scanner-systemd %files scanner-systemd
%defattr(-,root,root,-) %defattr(-,root,root,-)
%_unitdir/clamd.scan.service %_unitdir/clamd@scan.service
%endif %endif
## ----------------------- ## -----------------------
@ -854,6 +855,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
- set correct SELinux context for logfiles generated in %%post (#754555) - set correct SELinux context for logfiles generated in %%post (#754555)
- create systemd tmpfiles in %%post - create systemd tmpfiles in %%post
- created -server-systemd subpackage providing a clamd@.service template - created -server-systemd subpackage providing a clamd@.service template
- made script in -scanner-systemd an instance of clamd@.service
* Tue Oct 18 2011 Nick Bebout <nb@fedoraproject.org> - 0.97.3-1700 * Tue Oct 18 2011 Nick Bebout <nb@fedoraproject.org> - 0.97.3-1700
- updated to 0.97.3 - updated to 0.97.3

12
clamd.scan.systemd
View File

@ -1,12 +0,0 @@
[Unit]
Description = Generic clamav scanner daemon
After = syslog.target nss-lookup.target network.target
Before = clamav-milter.service
[Service]
Type = simple
ExecStart = /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes
Restart = on-failure
[Install]
WantedBy = multi-user.target

7
clamd@scan.service Normal file
View File

@ -0,0 +1,7 @@
.include /lib/systemd/system/clamd@.service
[Unit]
Description = Generic clamav scanner daemon
[Install]
WantedBy = multi-user.target