From 6f54f29b7061f45dd76249cbae80893bcb007814 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 23 Sep 2016 16:30:28 +0800 Subject: squid: specify sysconfdir and logdir The default sysconfdir is /etc and logdir is /var/logs. Set sysconfdir and logdir when configure, replace them with /etc/squid and /var/log/squid. Signed-off-by: Yi Zhao Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch | 6 +++--- meta-networking/recipes-daemons/squid/files/volatiles.03_squid | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'meta-networking/recipes-daemons/squid/files') diff --git a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch index a5e554736a..312f44f8eb 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch @@ -37,7 +37,7 @@ index d5468be..77fc480 100644 ## $(AR_R) $(TARGLIB) $(LIBOBJS) -squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* -+squid-conf-tests: /etc/squid.conf.default squidconf/* ++squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/* @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ for cfg in $$cfglist ; do \ - $(top_builddir)/src/squid -k parse -f $$cfg || \ @@ -45,7 +45,7 @@ index d5468be..77fc480 100644 { echo "FAIL: squid.conf test: $$cfg" | \ - sed s%$(top_builddir)/src/%% | \ - sed s%$(srcdir)/squidconf/%% ; \ -+ sed s%/etc/%% | \ ++ sed s%$(sysconfdir)/%% | \ + sed s%squidconf/%% ; \ failed=1; break; \ }; \ @@ -53,7 +53,7 @@ index d5468be..77fc480 100644 echo "PASS: squid.conf test: $$cfg" | \ - sed s%$(top_builddir)/src/%% | \ - sed s%$(srcdir)/squidconf/%% ; \ -+ sed s%/etc/%% | \ ++ sed s%$(sysconfdir)/%% | \ + sed s%squidconf/%% ; \ else break; fi; \ done; \ diff --git a/meta-networking/recipes-daemons/squid/files/volatiles.03_squid b/meta-networking/recipes-daemons/squid/files/volatiles.03_squid index b96865d731..83e1f8b7a5 100644 --- a/meta-networking/recipes-daemons/squid/files/volatiles.03_squid +++ b/meta-networking/recipes-daemons/squid/files/volatiles.03_squid @@ -1,2 +1,3 @@ # d squid squid 0755 /var/run/squid none +d squid squid 0750 /var/log/squid none -- cgit v1.2.3-54-g00ecf