From c5efa8f9fdad558f14d47ca728826806accaee46 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Mon, 27 May 2019 13:34:32 +0200 Subject: [PATCH] Related: #1709299 - Use upstream squid.service - fixed wrong paths to run dir + kill binary --- squid.service | 4 ++-- squid.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/squid.service b/squid.service index 5322847..724f35c 100644 --- a/squid.service +++ b/squid.service @@ -6,11 +6,11 @@ After=network.target network-online.target nss-lookup.target [Service] Type=forking LimitNOFILE=16384 -PIDFile=/var/run/squid.pid +PIDFile=/run/squid.pid EnvironmentFile=/etc/sysconfig/squid ExecStartPre=/usr/libexec/squid/cache_swap.sh ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF -ExecReload=/bin/kill -HUP $MAINPID +ExecReload=/usr/bin/kill -HUP $MAINPID KillMode=mixed [Install] diff --git a/squid.spec b/squid.spec index 44ab605..f8cc758 100644 --- a/squid.spec +++ b/squid.spec @@ -2,7 +2,7 @@ Name: squid Version: 4.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -282,7 +282,7 @@ fi %changelog -* Wed May 22 2019 Lubos Uhliarik - 7:4.7-3 +* Wed May 22 2019 Lubos Uhliarik - 7:4.7-4 - Related: #1709299 - Use upstream squid.service * Fri May 17 2019 Luboš Uhliarik - 7:4.7-1