Merge lp:~sdeziel/squid-deb-proxy/fix-for-lp984806 into lp:squid-deb-proxy

[Simon Déziel]

Fix for LP #984806

3rd and hopefully last proposal attempt. I'm really sorry for all the noise.

=== modified file 'debian/squid-deb-proxy.logrotate'
--- debian/squid-deb-proxy.logrotate	2011-03-23 20:52:34 +0000
+++ debian/squid-deb-proxy.logrotate	2012-04-18 14:03:21 +0000
@@ -10,6 +10,15 @@
  nocreate
  sharedscripts
  postrotate
-  test ! -e /var/run/squid-deb-proxy.pid || /usr/sbin/squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf -k rotate
+  if [ -x /usr/sbin/squid ]; then
+      SQUID=/usr/sbin/squid
+  elif  [ -x /usr/sbin/squid3 ]; then
+      SQUID=/usr/sbin/squid3
+  else
+      echo "No squid binary found"
+      exit 1
+  fi
+
+  test ! -e /var/run/squid-deb-proxy.pid || $SQUID -f /etc/squid-deb-proxy/squid-deb-proxy.conf -k rotate
  endscript
 }