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

[LaMont Jones]

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

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

[Andres Rodriguez (andreserl)]

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

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