MAAS

Merge lp:~lamont/maas/bug-1592954 into lp:~maas-maintainers/maas/packaging

  1. bug-1592954
  2. Merge into packaging
Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: no longer in the source branch.
Merged at revision: 506
Proposed branch: lp:~lamont/maas/bug-1592954
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 34 lines (+7/-2)
2 files modified
debian/changelog (+2/-0)
debian/maas-proxy.maas-proxy.service (+5/-2)
To merge this branch: bzr merge lp:~lamont/maas/bug-1592954
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+297807@code.launchpad.net

Commit message

Wait for squid to finish starting in systemctl start maas-proxy

Description of the change

Wait for squid to finish starting in systemctl start maas-proxy

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

looks way better!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-06-17 18:18:34 +0000
3+++ debian/changelog 2016-06-17 22:30:29 +0000
4@@ -32,6 +32,8 @@
5 * Versioned Depend on squid
6 * debian/maas-region-controller.config: Ensure dbc_go is not run when
7 dbconfig common is not yet installed.
8+ * Wait for squid to finish starting before returning from the start command.
9+ LP: #1592954
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 14 Jun 2016 17:08:48 -0400
12
13
14=== modified file 'debian/maas-proxy.maas-proxy.service'
15--- debian/maas-proxy.maas-proxy.service 2016-04-01 23:13:30 +0000
16+++ debian/maas-proxy.maas-proxy.service 2016-06-17 22:30:29 +0000
17@@ -5,12 +5,15 @@
18 ConditionPathExists=/var/lib/maas/maas-proxy.conf
19
20 [Service]
21+Type=forking
22+PIDFile=/run/squid.pid
23+Restart=always
24 ExecStartPre=/bin/mkdir -p /run/maas/proxy
25 ExecStartPre=/bin/sh -ec '\
26 . /usr/share/maas/maas-proxy-common.sh; \
27 pre_start'
28-ExecStart=/usr/sbin/squid3 -N -f /var/lib/maas/maas-proxy.conf
29-ExecReload=/usr/sbin/squid3 -k reconfigure
30+ExecStart=/usr/sbin/squid -Y -f /var/lib/maas/maas-proxy.conf
31+ExecReload=/usr/sbin/squid -k reconfigure
32
33 [Install]
34 WantedBy=multi-user.target

Subscribers

People subscribed via source and target branches