From 7160f275584f8ec3d820eaeb9d09657532835784 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun, 18 Feb 2018 19:27:02 +0100
Subject: [PATCH] Remove sysconfig and logrotate. ANd change the unit to simple

---
 c-icap.service   | 6 +++---
 c-icap.spec      | 7 -------
 c-icap.sysconfig | 4 ----
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 c-icap.sysconfig

diff --git a/c-icap.service b/c-icap.service
index 4223d91..f3f47b3 100644
--- a/c-icap.service
+++ b/c-icap.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=C-ICAP Server
-After=network.target remote-fs.target nss-lookup.target
+After=network.target
 
 [Service]
-Type=forking
+Type=simple
 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]
 WantedBy=multi-user.target
diff --git a/c-icap.spec b/c-icap.spec
index 9c24191..9153b31 100644
--- a/c-icap.spec
+++ b/c-icap.spec
@@ -8,8 +8,6 @@ License:          LGPL
 
 Source0:          http://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/c_icap-%{version}.tar.gz
 Source1:          %{name}.service
-Source2:          %{name}.sysconfig
-Source3:          %{name}.logrotate
 Source4:          %{name}.conf
 
 URL:              http://%{name}.sourceforge.net/
@@ -94,15 +92,12 @@ The %{name}-progs package contains several commandline tools for %{name}.
 
 %install
 [ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig}
 %{__mkdir_p} %{buildroot}%{_sbindir}
 %{__mkdir_p} %{buildroot}%{_datadir}/%{modn}/{contrib,templates}
 %{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
 
 %{__make} DESTDIR=%{buildroot} install
 %{__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 -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/c-icap.service
 %{__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}/*.magic
 %attr(640,root,%{name}) %{_sysconfdir}/%{name}/*.default
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_unitdir}/c-icap.service 
 %dir %{_libdir}/%{modn}
 %{_libdir}/%{modn}/bdb_tables.so
diff --git a/c-icap.sysconfig b/c-icap.sysconfig
deleted file mode 100644
index f4964a1..0000000
--- a/c-icap.sysconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/sysconfig/c-icap
-#
-# Add extra daemon options here
-OPTIONS="-f /etc/c-icap/c-icap.conf"