From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 8 Oct 2015 12:44:41 +0000 (-0700)
Subject: Set default pid_filename based on service name
X-Git-Tag: SQUID_4_0_1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f36643ce6c27a19d0d5b61153ad2d6cfbe464b8;p=thirdparty%2Fsquid.git

Set default pid_filename based on service name

This makes pid_filename directive no longer need to be set explicitly to
the service name in multi-tenant installations. Unless the default value
has been replaced with --with-pidfile=Foo it will use the service name
as the .pid filename.
---

diff --git a/configure.ac b/configure.ac
index 1f56a26882..0979edf6dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,7 +266,7 @@ esac
 )
 AC_SUBST(DEFAULT_LOG_DIR)
 
-DEFAULT_PID_FILE="$localstatedir/run/squid.pid"
+DEFAULT_PID_FILE="$localstatedir/run/@SERVICE_NAME@.pid"
 AC_ARG_WITH(pidfile,
   AS_HELP_STRING([--with-pidfile=PATH],
     [Default location for squid pid file. Default: PREFIX/var/run/squid.pid]), [
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c84765e2c..6d1cb0c08a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -735,6 +735,7 @@ EXTRA_DIST = \
 	cf_gen_defines \
 	cf.data.pre \
 	cf.data.depend \
+	cf.data.sed \
 	mk-globals-c.awk \
 	mk-string-arrays.awk \
 	repl_modules.sh \
@@ -844,6 +845,7 @@ cf.data: cf.data.pre Makefile
 	-e "s%[@]DEFAULT_PREFIX[@]%$(DEFAULT_PREFIX)%g" \
 	-e "s%[@]DEFAULT_HOSTS[@]%$(DEFAULT_HOSTS)%g" \
 	-e "s%[@]SQUID[@]%SQUID\ $(VERSION)%g" \
+	-f $(srcdir)/cf.data.sed \
 	< $(srcdir)/cf.data.pre >$@
 
 repl_modules.cc: repl_modules.sh Makefile
diff --git a/src/cf.data.sed b/src/cf.data.sed
new file mode 100644
index 0000000000..d2b36bf38f
--- /dev/null
+++ b/src/cf.data.sed
@@ -0,0 +1 @@
+s%[@]SERVICE_NAME[@]%${service_name}%g