Merge lp:~andreserl/maas/lp1377964_proxy into lp:~maas-maintainers/maas/packaging.utopic

[Andres Rodriguez]

debian/maas-cluster-controller.postinst: Make sure that cluster sets
the correct permissions for proxy log dir if running on the same
system. (LP: #1377964)

[Christian Reis (kiko)]

Thanks!

This needs to be cleaned up as this duplication of code leads to annoying bugs.

review: Approve

[Andres Rodriguez (andreserl)]

Cleaning packaging is part of the roadmap.

review: Approve

[Julian Edwards (julian-edwards)]

On Thursday 06 Nov 2014 14:34:21 you wrote:
> Review: Approve
>
> Cleaning packaging is part of the roadmap.

All the utopic packaging changes need to be merged up to trunk as well.

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-31 02:46:24 +0000
+++ debian/changelog	2014-11-06 14:26:28 +0000
@@ -1,6 +1,8 @@
 maas (1.7.0~rc1+bzr3295-0ubuntu2) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * debian/maas-cluster-controller.postinst: Make sure that cluster sets
+    the correct permissions for proxy log dir if running on the same
+    system. (LP: #1377964)
 
  -- Andres Rodriguez <[e-mail]>  Thu, 30 Oct 2014 22:46:11 -0400
 

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2014-10-14 06:55:35 +0000
+++ debian/maas-cluster-controller.postinst	2014-11-06 14:26:28 +0000
@@ -25,6 +25,10 @@
     find /var/log/maas -not -user syslog -print0 | xargs -r0 chown maas:maas
     chmod -R 775 /var/log/maas/oops
     chown syslog:syslog /var/log/maas/maas.log
+    # If proxy log dir exists, set correct permissions
+    if [ -d /var/log/maas/proxy ]; then
+        chown -R proxy:proxy /var/log/maas/proxy
+    fi
 }
 
 configure_maas_tgt() {