Am 21.11.19 um 12:12 schrieb Michael Biebl: > Am 21.11.19 um 12:08 schrieb Michael Biebl: > >> I'm going to reassign this bug report to squid, asking it to use >> /run/squid.pid > > > Places that should be updated: > >> root@pluto:/tmp/squid-4.9# grep "/var/run/squid.pid" -R >> debian/squid.service:PIDFile=/var/run/squid.pid >> debian/squid.resolvconf:if [ -d /usr/sbin ] && [ -d /run/systemd/system ] >> && systemctl -q is-active squid || [ -f /var/run/squid.pid ] ; then >> debian/squid.rc:# pidfile: /var/run/squid.pid >> debian/squid.logrotate: test ! -e /var/run/squid.pid || test ! >> -x /usr/sbin/squid || /usr/sbin/squid -k rotate >> debian/rules: --with-pidfile=/var/run/squid.pid \ >> tools/systemd/squid.service:PIDFile=/var/run/squid.pid >> configure.ac: [Default location for squid pid file. Default: >> PREFIX/var/run/squid.pid]), [ >> configure: PREFIX/var/run/squid.pid >> ChangeLog: - Bug 2628: Correct default PID location to >> PREFIX/var/run/squid.pid > > > I guess the package should be built with > --with-pidfile=/run/squid.pid > and the squid.service, the resolvconf hook and logrotate file updated > accordingly. >
Untested patch attached. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/rules b/debian/rules
index ba9104f..986509a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := BUILDCXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)"
--disable-translation \
--with-swapdir=/var/spool/squid \
--with-logdir=/var/log/squid \
- --with-pidfile=/var/run/squid.pid \
+ --with-pidfile=/run/squid.pid \
--with-filedescriptors=65536 \
--with-large-files \
--with-default-user=proxy \
diff --git a/debian/squid.logrotate b/debian/squid.logrotate
index 796b93a..088a568 100644
--- a/debian/squid.logrotate
+++ b/debian/squid.logrotate
@@ -13,6 +13,6 @@
test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports daily
endscript
postrotate
- test ! -e /var/run/squid.pid || test ! -x /usr/sbin/squid || /usr/sbin/squid -k rotate
+ test ! -e /run/squid.pid || test ! -x /usr/sbin/squid || /usr/sbin/squid -k rotate
endscript
}
diff --git a/debian/squid.rc b/debian/squid.rc
index f5a6cea..98495fe 100644
--- a/debian/squid.rc
+++ b/debian/squid.rc
@@ -20,7 +20,7 @@
NAME=squid
DESC="Squid HTTP Proxy"
DAEMON=/usr/sbin/squid
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/run/$NAME.pid
CONFIG=/etc/squid/squid.conf
SQUID_ARGS="-YC -f $CONFIG"
diff --git a/debian/squid.resolvconf b/debian/squid.resolvconf
index d43dae9..6d1b272 100644
--- a/debian/squid.resolvconf
+++ b/debian/squid.resolvconf
@@ -4,6 +4,6 @@ PATH="/usr/sbin:/usr/bin:/sbin:/bin"
# Make squid aware of changes to resolv.conf
# Avoid reload before /usr is mounted and squid.pid is available
-if [ -d /usr/sbin ] && [ -d /run/systemd/system ] && systemctl -q is-active squid || [ -f /var/run/squid.pid ] ; then
+if [ -d /usr/sbin ] && [ -d /run/systemd/system ] && systemctl -q is-active squid || [ -f /run/squid.pid ] ; then
invoke-rc.d squid reload
fi
signature.asc
Description: OpenPGP digital signature
