Remove sysconfig and logrotate. ANd change the unit to simple
This commit is contained in:
parent
5f78087f25
commit
7160f27558
|
@ -1,11 +1,11 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=C-ICAP Server
|
Description=C-ICAP Server
|
||||||
After=network.target remote-fs.target nss-lookup.target
|
After=network.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=simple
|
||||||
EnvironmentFile=/etc/sysconfig/c-icap
|
EnvironmentFile=/etc/sysconfig/c-icap
|
||||||
ExecStart=/usr/sbin/c-icap $OPTIONS
|
ExecStart=/usr/sbin/c-icap -N -f /etc/c-icap/c-icap.conf -D -d 2
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
|
@ -8,8 +8,6 @@ License: LGPL
|
||||||
|
|
||||||
Source0: http://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/c_icap-%{version}.tar.gz
|
Source0: http://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/c_icap-%{version}.tar.gz
|
||||||
Source1: %{name}.service
|
Source1: %{name}.service
|
||||||
Source2: %{name}.sysconfig
|
|
||||||
Source3: %{name}.logrotate
|
|
||||||
Source4: %{name}.conf
|
Source4: %{name}.conf
|
||||||
|
|
||||||
URL: http://%{name}.sourceforge.net/
|
URL: http://%{name}.sourceforge.net/
|
||||||
|
@ -94,15 +92,12 @@ The %{name}-progs package contains several commandline tools for %{name}.
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
|
[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
|
||||||
%{__mkdir_p} %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig}
|
|
||||||
%{__mkdir_p} %{buildroot}%{_sbindir}
|
%{__mkdir_p} %{buildroot}%{_sbindir}
|
||||||
%{__mkdir_p} %{buildroot}%{_datadir}/%{modn}/{contrib,templates}
|
%{__mkdir_p} %{buildroot}%{_datadir}/%{modn}/{contrib,templates}
|
||||||
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
|
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
|
||||||
|
|
||||||
%{__make} DESTDIR=%{buildroot} install
|
%{__make} DESTDIR=%{buildroot} install
|
||||||
%{__mv} -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}
|
%{__mv} -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}
|
||||||
%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
|
|
||||||
%{__install} -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
|
||||||
%{__install} -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
%{__install} -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||||
%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/c-icap.service
|
%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/c-icap.service
|
||||||
%{__install} -m 0755 contrib/*.pl %{buildroot}%{_datadir}/%{modn}/contrib
|
%{__install} -m 0755 contrib/*.pl %{buildroot}%{_datadir}/%{modn}/contrib
|
||||||
|
@ -142,8 +137,6 @@ exit 0 # Always pass
|
||||||
%attr(640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/*.conf
|
%attr(640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/*.conf
|
||||||
%attr(640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/*.magic
|
%attr(640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/*.magic
|
||||||
%attr(640,root,%{name}) %{_sysconfdir}/%{name}/*.default
|
%attr(640,root,%{name}) %{_sysconfdir}/%{name}/*.default
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
|
||||||
%{_unitdir}/c-icap.service
|
%{_unitdir}/c-icap.service
|
||||||
%dir %{_libdir}/%{modn}
|
%dir %{_libdir}/%{modn}
|
||||||
%{_libdir}/%{modn}/bdb_tables.so
|
%{_libdir}/%{modn}/bdb_tables.so
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
# /etc/sysconfig/c-icap
|
|
||||||
#
|
|
||||||
# Add extra daemon options here
|
|
||||||
OPTIONS="-f /etc/c-icap/c-icap.conf"
|
|
Loading…
Reference in New Issue
Block a user