Merge lp:~jtv/maas/pkg-bug-1089802 into lp:~maas-maintainers/maas/packaging

[Jeroen T. Vermeulen]

Make maas_cluster.conf non-world-readable, now that it contains the cluster UUID.

We like to keep the cluster uuid confidential. But now that it's been duplicated into maas_cluster.conf, it is exposed to anyone with filesystem access on the cluster controller. This branch fixes that.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-12-12 17:44:39 +0000
+++ debian/maas-cluster-controller.postinst	2012-12-13 10:11:25 +0000
@@ -69,12 +69,6 @@
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     # logging
     create_log_dir
-
-    # The local celery config may contain a private cluster UUID.  Only
-    # maas can read it; only root can write it.
-    chown root:maas /etc/maas/maas_local_celeryconfig_cluster.py
-    chmod 0640 /etc/maas/maas_local_celeryconfig_cluster.py
-
     configure_maas_tgt
 fi
 
@@ -97,6 +91,15 @@
 fi
 
 if [ "$1" = "configure" ]; then
+    # These config files may contain a private cluster UUID.  Only maas
+    # can read them; only root can write them
+    chown root:maas \
+        /etc/maas/maas_local_celeryconfig_cluster.py \
+        /etc/maas/maas_cluster.conf
+    chmod 0640 \
+        /etc/maas/maas_local_celeryconfig_cluster.py \
+        /etc/maas/maas_cluster.conf
+
     configure_cluster_uuid
 fi