Merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/fix-upstart-jobs into lp:ubuntu/natty/squid-deb-proxy

Proposed by Clint Byrum
Status: Merged
Merged at revision: 6
Proposed branch: lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/fix-upstart-jobs
Merge into: lp:ubuntu/natty/squid-deb-proxy
Diff against target: 52 lines (+13/-4)
3 files modified
debian/changelog (+9/-0)
debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart (+2/-2)
debian/squid-deb-proxy.upstart (+2/-2)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/fix-upstart-jobs
Reviewer Review Type Date Requested Status
Bilal Akhtar (community) Approve
Ubuntu branches Pending
Review via email: mp+41256@code.launchpad.net

Description of the change

Fixes problems with boxes on wifi and restarting squid-deb-proxy.

To post a comment you must log in.
Revision history for this message
Bilal Akhtar (bilalakhtar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-11-10 10:45:49 +0000
+++ debian/changelog 2010-11-19 00:54:09 +0000
@@ -1,3 +1,12 @@
1squid-deb-proxy (0.3.3) natty; urgency=low
2
3 * Adjusting upstart job so restarting squid-deb-proxy does not result
4 in killing squid-deb-proxy-avahi. (LP: #677276)
5 * Also adjusting upstart job so squid-deb-proxy does not get started
6 a real network interface is up and all local filesystems are mounted
7
8 -- Clint Byrum <clint@ubuntu.com> Thu, 18 Nov 2010 16:27:24 -0800
9
1squid-deb-proxy (0.3.2) natty; urgency=low10squid-deb-proxy (0.3.2) natty; urgency=low
211
3 [ Colin Dean ]12 [ Colin Dean ]
413
=== modified file 'debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart'
--- debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart 2010-11-10 10:45:49 +0000
+++ debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart 2010-11-19 00:54:09 +0000
@@ -4,7 +4,7 @@
4description "squid-deb-proxy-avahi"4description "squid-deb-proxy-avahi"
55
6start on (started squid-deb-proxy and started avahi-daemon)6start on (started squid-deb-proxy and started avahi-daemon)
7stop on stopping squid-deb-proxy7stop on stopped squid-deb-proxy
88
9# get it back with 9# get it back with
10# avahi-browse -prt _apt_proxy._tcp10# avahi-browse -prt _apt_proxy._tcp
@@ -13,4 +13,4 @@
13 if [ -n "$PORT" ] && [ -x /usr/bin/avahi-publish ]; then13 if [ -n "$PORT" ] && [ -x /usr/bin/avahi-publish ]; then
14 exec avahi-publish -s "Squid deb proxy" _apt_proxy._tcp $PORT14 exec avahi-publish -s "Squid deb proxy" _apt_proxy._tcp $PORT
15 fi15 fi
16end script
17\ No newline at end of file16\ No newline at end of file
17end script
1818
=== modified file 'debian/squid-deb-proxy.upstart'
--- debian/squid-deb-proxy.upstart 2010-01-26 09:19:50 +0000
+++ debian/squid-deb-proxy.upstart 2010-11-19 00:54:09 +0000
@@ -11,8 +11,8 @@
11 fi11 fi
12end script12end script
1313
14start on runlevel [2345]14start on (local-filesystems and net-device-up IFACE!=lo)
15stop on runlevel [!2345]15stop on runlevel [!2345]
1616
17expect fork17expect fork
18exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf
19\ No newline at end of file18\ No newline at end of file
19exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf

Subscribers

People subscribed via source and target branches

to all changes: