Resolves: #1786485 - squid.service: use ${SQUID_CONF} rather than $SQUID_CONF

This commit is contained in:
Lubos Uhliarik 2020-03-25 13:29:43 +01:00
parent e8453476a9
commit af7f6a39b7
2 changed files with 5 additions and 2 deletions

View File

@ -9,7 +9,7 @@ LimitNOFILE=16384
PIDFile=/run/squid.pid
EnvironmentFile=/etc/sysconfig/squid
ExecStartPre=/usr/libexec/squid/cache_swap.sh
ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF
ExecStart=/usr/sbin/squid $SQUID_OPTS -f ${SQUID_CONF}
ExecReload=/usr/bin/kill -HUP $MAINPID
KillMode=mixed

View File

@ -2,7 +2,7 @@
Name: squid
Version: 4.10
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code
@ -295,6 +295,9 @@ fi
%changelog
* Wed Mar 25 2020 Lubos Uhliarik <luhliari@redhat.com> - 7:4.10-2
- Resolves: #1786485 - squid.service: use ${SQUID_CONF} rather than $SQUID_CONF
* Tue Jan 28 2020 Lubos Uhliarik <luhliari@redhat.com> - 7:4.10-1
- new version 4.10