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

[Andres Rodriguez]

Fix log directory permission creation to ensure that log dir and files are created with correct permissions.

[Ricardo Bánffy (rbanffy)]

Looks good and, best of all, works.

review: Approve

[Mike Pontillo (mpontillo)]

Functionality looks good; just one small nit about the comment.

review: Approve

[Andres Rodriguez (andreserl)]

review: Approve

[Mike Pontillo (mpontillo)]

Looks good to me... just wanted to confirm that this is no longer required:

chown syslog:syslog /var/log/maas/maas.log

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-20 19:56:31 +0000
+++ debian/changelog	2015-05-20 22:19:33 +0000
@@ -1,3 +1,11 @@
+maas (1.8.0~beta7+bzr3916-0ubuntu1~trusty0) trusty; urgency=medium
+
+  * debian/{maas-cluster-controller,maas-common,
+    maas-region-controller-min}.postinst: Cleaned up to correctly create
+    log dir permissions (LP: #1457191)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 20 May 2015 17:03:13 -0400
+
 maas (1.8.0~beta6+bzr3891-0ubuntu1) trusty; urgency=medium
 
   * New upstream release, 1.8.0 beta 6 bzr3904:

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2015-03-17 17:15:56 +0000
+++ debian/maas-cluster-controller.postinst	2015-05-20 22:19:33 +0000
@@ -7,25 +7,20 @@
 
 RELEASE=`lsb_release -rs` || RELEASE=""
 
-create_log_dir() {
-    # create log dir
+create_var_dir() {
+    # create var dir
     if [ ! -d /var/lib/maas ]; then
         mkdir -p /var/lib/maas
     fi
-    # Main syslog file.
-    if [ ! -f /var/log/maas/maas.log ]; then
-        mkdir -p /var/log/maas
-        touch /var/log/maas/maas.log
-    fi
+    chown -R maas:maas /var/lib/maas/
 
+}
+create_log_dir() {
     # Give appropriate permissions
-    chown -R maas:maas /var/lib/maas/
-    find /var/log/maas -not -user syslog -print0 | xargs -r0 chown maas:maas
-    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
+    if [ ! -f /var/log/maas/clusterd.log ]; then
+        touch /var/log/maas/clusterd.log
     fi
+    chown maas:maas /var/log/maas/clusterd.log
 }
 
 configure_maas_tgt() {
@@ -111,13 +106,12 @@
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     create_log_dir
+    create_var_dir
     configure_maas_tgt
 fi
 
 if [ "$1" = "configure" ]; then
-    if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
-        create_log_dir
-    fi
+    create_log_dir
 
     configure_maas_tgt
     configure_maas_url

=== modified file 'debian/maas-common.postinst'
--- debian/maas-common.postinst	2015-05-14 11:27:37 +0000
+++ debian/maas-common.postinst	2015-05-20 22:19:33 +0000
@@ -3,13 +3,15 @@
 set -e
 
 create_log_dir(){
-    # Main syslog file.
+    # Logging directory (/var/log/maas)
+    if [ ! -d /var/log/maas ]; then
+        mkdir -p /var/log/maas
+        chown -R maas:maas /var/log/maas/
+    fi
+
     if [ ! -f /var/log/maas/maas.log ]; then
-        mkdir -p /var/log/maas
         touch /var/log/maas/maas.log
     fi
-
-    # Give appropriate permissions
     chown syslog:syslog /var/log/maas/maas.log
 }
 

=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	2015-02-11 14:22:53 +0000
+++ debian/maas-region-controller-min.postinst	2015-05-20 22:19:33 +0000
@@ -35,13 +35,7 @@
 	if [ ! -f /var/log/maas/regiond.log ]; then
 		touch /var/log/maas/regiond.log
 	fi
-	chown -R maas:maas /var/log/maas
-
-	# Main syslog file.
-	if [ ! -f /var/log/maas/maas.log ]; then
-		touch /var/log/maas/maas.log
-	fi
-	chown syslog:syslog /var/log/maas/maas.log
+	chown maas:maas /var/log/maas/regiond.log
 
 	# Create log directory base
 	mkdir -p /var/log/maas/rsyslog
@@ -49,14 +43,7 @@
 	# 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() {
+	# apache2 log symlinks
 	ln -sf /var/log/apache2 /var/log/maas/
 }
 
@@ -117,7 +104,6 @@
     ################  Configure Logging  ####################
     #########################################################
     configure_logging
-    configure_third_party_log_symlinks
 
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     # Set the IP address of the interface with default route
@@ -130,7 +116,6 @@
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
     # Logging changed at r2611, ensure it is set up.
     configure_logging
-    configure_third_party_log_symlinks
 
     # If upgrading to any later package version, then upgrade db.
     invoke-rc.d apache2 stop || true