Merge lp:~gandelman-a/ubuntu/precise/squid3/lp891445 into lp:ubuntu/precise/squid3

[Adam Gandelman]

The upstart job now shipped with squid3 is an upstart-ified version of the sysv init script shipped with the squid(v2) package. This fixes a couple of bugs in in the pre-start that were a result of the conversion to upstart.

[lp:~gandelman-a/ubuntu/precise/squid3/lp891445]

34. By Adam Gandelman on 2011-11-17

* debian/squid3.upstart: Modify to better reflect functionality of Debian's
  squid3.rc
* debian/rules: Fix permissions on upstart job

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-11 10:33:44 +0000
+++ debian/changelog	2011-11-17 22:40:28 +0000
@@ -1,3 +1,14 @@
+squid3 (3.1.15-1ubuntu3) precise; urgency=low
+
+  * debian/squid3.upstart: Properly return 0 from maxfds() if $SQUID_MAXFD is
+    unset, else pre-start will fail as well. Also fix paths to config file.
+    (LP: #891445)
+  * debian/squid3.upstart: Modify to better reflect functionality of Debian's
+    squid3.rc
+  * debian/rules: Fix permissions on upstart job
+
+ -- Adam Gandelman <[e-mail]>  Wed, 16 Nov 2011 18:26:25 -0800
+
 squid3 (3.1.15-1ubuntu2) precise; urgency=low
 
   * Fix spelling of squid-common transitional package name.

=== modified file 'debian/rules'
--- debian/rules	2011-11-10 08:59:31 +0000
+++ debian/rules	2011-11-17 22:40:28 +0000
@@ -72,7 +72,7 @@
 	install -m 755 -g root -d $(INSTALLDIR)/etc/resolvconf/update-libc.d
 	install -m 755 -g root -d $(INSTALLDIR)/etc/ufw/applications.d
 	install -m 755 -g root debian/squid3.rc $(INSTALLDIR)/etc/init.d/squid3
-	install -m 755 -g root debian/squid3.upstart $(INSTALLDIR)/etc/init/squid3.conf
+	install -m 644 -g root debian/squid3.upstart $(INSTALLDIR)/etc/init/squid3.conf
 	install -m 755 -g root debian/squid3.resolvconf $(INSTALLDIR)/etc/resolvconf/update-libc.d/squid3
 	install -m 644 -g root debian/squid3.logrotate $(INSTALLDIR)/etc/logrotate.d/squid3
 	install -m 644 -g root debian/squid3.ufw.profile $(INSTALLDIR)/etc/ufw/applications.d/squid3

=== modified file 'debian/squid3.upstart'
--- debian/squid3.upstart	2011-11-10 08:59:31 +0000
+++ debian/squid3.upstart	2011-11-17 22:40:28 +0000
@@ -9,71 +9,47 @@
 start on runlevel [2345]
 stop on runlevel [!2345]
 
-# Disable DNS checks so we can start squid
-# before a "real" network is available.
-env SQUID_ARGS="-D"
+env CONFIG="/etc/squid3/squid.conf"
+env SQUID_ARGS="-YC"
 
 pre-start script
 	if [ -f /etc/default/squid3 ]; then
 		. /etc/default/squid3
 	fi
 
-
-	grepconf () {
-        	w="     " # space tab
-        	sq=/etc/squid/squid.conf
-        	# sed is cool.
-        	res=`sed -ne '
-                	s/^'$1'['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
-                	t end;
-                	d;
-                :end q' < $sq`
-        	[ -n "$res" ] || res=$2
+	find_cache_dir () {
+		w="     " # space tab
+		res=`sed -ne '
+			s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+			t end;
+			d;
+			:end q' < $CONFIG`
+		[ -n "$res" ] || res=$2
 		echo "$res"
 	}
 
-	grepconf2 () {
-        	w="     " # space tab
-        	sq=/etc/squid/squid.conf
-        	# sed is cool.
-        	res=`sed -ne '
-                	s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
-                	t end;
-                	d;
-                :end q' < $sq`
-        	[ -n "$res" ] || res=$2
-        	echo "$res"
-	}
-	#
-	# Try to increase the # of filedescriptors we can open.
-	#
-	maxfds () {
-		[ -n "$SQUID_MAXFD" ] || return
-		[ -f /proc/sys/fs/file-max ] || return 0
-		global_file_max=`cat /proc/sys/fs/file-max`
-		minimal_file_max=$(($SQUID_MAXFD + 4096))
-		if [ "$global_file_max" -lt $minimal_file_max ]
-		then
-			echo $minimal_file_max > /proc/sys/fs/file-max
-		fi
-		ulimit -n $SQUID_MAXFD
-	}
-
-	cdr=`grepconf2 cache_dir /var/spool/squid`
-	ctp=`grepconf cache_dir ufs`
-
-	case "$cdr" in
-		[0-9]*)
-			echo "squid: squid.conf contains 2.2.5 syntax - not starting"
-			exit 1 ; stop
-		;;
-	esac
-
-	if [ -d "$cdr" -a ! -d "$cdr/00" ] || [ "$ctp" = "coss" -a ! -w "$cdr" ]
+	find_cache_type () {
+	  w="   " # space tab
+	  res=`sed -ne '
+	    s/^'$1'['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+	    t end;
+	    d;
+	    :end q' < $CONFIG`
+	  [ -n "$res" ] || res=$2
+	  echo "$res"
+	}
+
+	cache_dir=`find_cache_dir cache_dir`
+	cache_type=`find_cache_type cache_dir`
+
+	if [ "$cache_type" = "coss" -a -d "$cache_dir" -a ! -f "$cache_dir/stripe" ] ||
+	   [ "$cache_type" != "coss" -a -d "$cache_dir" -a ! -d "$cache_dir/00" ]
 	then
-		/usr/sbin/squid $SQUID_ARGS -z
+		/usr/sbin/squid3 $SQUID_ARGS -z -f $CONFIG
 	fi
-	maxfds
+
+	umask 027
+	ulimit -n 65535
 end script
 
 script
@@ -81,5 +57,5 @@
 		. /etc/default/squid3
 	fi
 
-	exec /usr/sbin/squid3 -N $SQUID_ARGS
+	exec /usr/sbin/squid3 -N $SQUID_ARGS -f $CONFIG
 end script