Merge lp:~andreserl/maas/packaging_fix_proxy_log_permissions into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Ensure maas proxy log dir has correct permissions

[Andres Rodriguez (andreserl)]

self approve

review: Approve

=== modified file 'debian/maas-proxy.postinst'
--- debian/maas-proxy.postinst	2014-09-21 22:05:31 +0000
+++ debian/maas-proxy.postinst	2014-09-24 17:17:48 +0000
@@ -8,6 +8,10 @@
     # We run our own squid3 instances.
     invoke-rc.d squid3 stop
 
+    # Ensure log folder is created.
+    mkdir -p /var/log/maas/proxy
+    chown -R proxy:proxy /var/log/maas/proxy
+
 fi
 
 #DEBHELPER#

=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	2014-09-12 19:10:04 +0000
+++ debian/maas-region-controller-min.postinst	2014-09-24 17:17:48 +0000
@@ -120,6 +120,11 @@
     # Make sure rsyslog reads our config
     invoke-rc.d rsyslog restart
 
+    # If proxy log dir exists, set correct permissions
+    if [ -d /var/log/maas/proxy ]; then
+        chown -R proxy:proxy /var/log/maas/proxy
+    fi
+
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     # Set the IP address of the interface with default route
     db_get maas/default-maas-url

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-09-12 19:10:04 +0000
+++ debian/maas-region-controller.postinst	2014-09-24 17:17:48 +0000
@@ -150,6 +150,11 @@
 	chown -R syslog:syslog /var/log/maas/rsyslog
 	# Make sure rsyslog reads our config
 	invoke-rc.d rsyslog restart
+
+	# 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_third_party_log_symlinks() {