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

[Andres Rodriguez]

Fix logging to remove pserv.log and not specify logging file in pserv.yaml

[Gavin Panella (allenap)]

My packaging change had a companion branch for trunk which landed after. I think this change was made in the interval between the two branches.

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Fixed. Self approving.

review: Approve

[Gavin Panella (allenap)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-22 20:26:54 +0000
+++ debian/changelog	2015-01-23 14:57:18 +0000
@@ -1,4 +1,4 @@
-maas (1.8.0~alpha1+bzr3480-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.8.0~alpha1+bzr3489-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Blake Rouse ]
   * debian/control: added python-pyscss as a build dependency.

=== modified file 'debian/maas-cluster-controller.preinst'
--- debian/maas-cluster-controller.preinst	2014-10-10 12:07:14 +0000
+++ debian/maas-cluster-controller.preinst	2015-01-23 14:57:18 +0000
@@ -26,6 +26,12 @@
         fi
     fi
 
+    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3486-0ubuntu1; then
+        if [ -f /var/log/maas/pserv.log ]; then
+            rm -rf /var/log/maas/pserv.log
+        fi
+    fi
+
 fi
 
 #DEBHELPER#

=== modified file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	2014-12-09 16:51:53 +0000
+++ debian/patches/01-fix-database-settings.patch	2015-01-23 14:57:18 +0000
@@ -1,6 +1,10 @@
---- a/contrib/maas_local_settings.py
-+++ b/contrib/maas_local_settings.py
-@@ -78,5 +78,5 @@
+Index: maas-1.8.0~alpha1+bzr3486.orig/contrib/maas_local_settings.py
+===================================================================
+--- maas-1.8.0~alpha1+bzr3486.orig.orig/contrib/maas_local_settings.py	2015-01-23 09:50:03.185579822 -0500
++++ maas-1.8.0~alpha1+bzr3486.orig/contrib/maas_local_settings.py	2015-01-23 09:50:03.181579822 -0500
+@@ -14,9 +14,9 @@
+     'default': {
+         # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
          'ENGINE': 'django.db.backends.postgresql_psycopg2',
 -        'NAME': '',
 -        'USER': '',
@@ -9,3 +13,5 @@
 +        'USER': 'maas',
 +        'PASSWORD': 'maas',
          'HOST': 'localhost',
+     }
+ }

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2015-01-15 10:07:52 +0000
+++ debian/patches/02-pserv-config.patch	2015-01-23 14:57:18 +0000
@@ -4,17 +4,10 @@
 Author: Andres Rodriguez <[e-mail]>
 
 === modified file 'etc/maas/pserv.yaml'
---- a/etc/maas/pserv.yaml	2015-01-14 16:24:44 +0000
-+++ b/etc/maas/pserv.yaml	2015-01-15 10:05:50 +0000
-@@ -6,7 +6,7 @@
- ## running server.
- #
- # logfile: "pserv.log"
--logfile: "/dev/null"
-+logfile: "/var/log/maas/pserv.log"
- 
- ## TFTP configuration.
- #
+Index: maas-1.8.0~alpha1+bzr3486.orig/etc/maas/pserv.yaml
+===================================================================
+--- maas-1.8.0~alpha1+bzr3486.orig.orig/etc/maas/pserv.yaml	2015-01-23 09:49:28.057580893 -0500
++++ maas-1.8.0~alpha1+bzr3486.orig/etc/maas/pserv.yaml	2015-01-23 09:49:49.137580251 -0500
 @@ -18,8 +18,6 @@
    # resource_root: /var/lib/maas/boot-resources/current/
  
@@ -24,4 +17,3 @@
    # generator: http://localhost/MAAS/api/1.0/pxeconfig/
 -  generator: http://localhost:5243/api/1.0/pxeconfig/
  
-