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

Proposed by LaMont Jones on 2016-04-11
Status: Merged
Approved by: LaMont Jones on 2016-04-11
Approved revision: 481
Merged at revision: 481
Proposed branch: lp:~lamont/maas/bug-1568847
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 28 lines (+6/-2)
2 files modified
debian/changelog (+2/-0)
debian/extras/maas-proxy-common.sh (+4/-2)
To merge this branch: bzr merge lp:~lamont/maas/bug-1568847
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) 2016-04-11 Approve on 2016-04-11
Review via email: mp+291515@code.launchpad.net

Commit message

Only try to create the squid cache if we have a config file.

Description of the change

Only try to create the squid cache if we have a config file.

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

lgtm! Make sure that the cache directory is created since the systemd job shouldn'y really run in /var/lib/maas/maas-proxy.conf doesn't exist.

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-04-07 22:24:07 +0000
3+++ debian/changelog 2016-04-11 14:30:49 +0000
4@@ -1,6 +1,8 @@
5 maas (2.0.0~beta2+bzr4889-0ubuntu1) UNRELEASED; urgency=medium
6
7 * UNRELEASED
8+ * Only create the squid cache if we have a configuration file.
9+ LP: #1568847
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 07 Apr 2016 18:22:00 -0400
12
13
14=== modified file 'debian/extras/maas-proxy-common.sh'
15--- debian/extras/maas-proxy-common.sh 2016-03-29 21:46:13 +0000
16+++ debian/extras/maas-proxy-common.sh 2016-04-11 14:30:49 +0000
17@@ -15,7 +15,9 @@
18 if [ -d /var/log/maas/proxy ]; then
19 chown -R proxy:proxy /var/log/maas/proxy
20 fi
21- if [ ! -d /var/cache/maas-proxy/00 ]; then
22- $SQUID -z -N -f /var/lib/maas/maas-proxy.conf
23+ if [ -f /var/lib/maas/maas-proxy.conf ]; then
24+ if [ ! -d /var/cache/maas-proxy/00 ]; then
25+ $SQUID -z -N -f /var/lib/maas/maas-proxy.conf
26+ fi
27 fi
28 }

Subscribers

People subscribed via source and target branches