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

[Andres Rodriguez]

Release 1.5+bzr1948-0ubuntu2
Open 1.5+bzr1948-0ubuntu3

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-13 19:17:14 +0000
+++ debian/changelog	2014-02-15 21:26:52 +0000
@@ -1,4 +1,21 @@
-maas (1.5+bzr1930-0ubuntu1) UNRELEASED; urgency=low
+maas (1.5+bzr1948-0ubuntu3) UNRELEASED; urgency=low
+
+  * UNRELEASED 
+
+ -- Andres Rodriguez <[e-mail]>  Sat, 15 Feb 2014 16:16:38 -0500
+
+maas (1.5+bzr1948-0ubuntu2) trusty; urgency=low
+
+  * debian/maas-cluster-controller.postinst: Make sure generator on
+    pserv.yaml is updated on upgrade or reconfigure. (LP: #1273197)
+  * debian/maas-cluster-controller.maas-pserv.upstart: Make sure maas-pserv
+    is started with authbind.
+
+ -- Andres Rodriguez <[e-mail]>  Sat, 15 Feb 2014 13:55:20 -0500
+
+maas (1.5+bzr1948-0ubuntu1) trusty; urgency=low
+
+  * New upstream release.
 
   [ Graham Binns ]
   * debian/control: Depends on python-jsonschema.
@@ -6,6 +23,7 @@
   [ Andres Rodriguez ]
   * debian/maas-region-controller-min.posinst: Make txlongpoll.yaml only
     readable by the app and not world readeable.
+  * debian/patches/02-pserv-config.patch: Refreshed.
 
   [ Julian Edwards ]
   * debian/extras/maas-cli renamed to debian/extras/maas, and introduce
@@ -23,7 +41,7 @@
   * debian/maas-region-controller-min.postinst: Make sure txlongpoll.yaml
     gets correct permissions on upgrade (LP: #1254034)
 
- -- Andres Rodriguez <[e-mail]>  Thu, 13 Feb 2014 14:17:01 -0500
+ -- Andres Rodriguez <[e-mail]>  Sat, 15 Feb 2014 12:08:23 -0500
 
 maas (1.5+bzr1909-0ubuntu1) trusty; urgency=low
 

=== modified file 'debian/maas-cluster-controller.maas-pserv.upstart'
--- debian/maas-cluster-controller.maas-pserv.upstart	2012-12-13 09:52:54 +0000
+++ debian/maas-cluster-controller.maas-pserv.upstart	2014-02-15 21:26:52 +0000
@@ -27,5 +27,5 @@
     # file.
     export CLUSTER_UUID
     # To add options to your daemon, edit the line below:
-    exec /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml
+    exec /usr/bin/authbind --deep /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml
 end script

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2013-12-05 17:43:07 +0000
+++ debian/maas-cluster-controller.postinst	2014-02-15 21:26:52 +0000
@@ -116,20 +116,7 @@
     fi
 }
 
-
-
-if [ "$1" = "configure" ] && [ -z "$2" ]; then
-    # logging
-    create_log_dir
-    configure_maas_tgt
-fi
-
-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
-
-    if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
-        create_log_dir
-    fi
-
+configure_pserv_generator(){
     # Get the MAAS_URL on configure/reconfigure and write it to the conf files.
     db_get maas-cluster-controller/maas-url || true
     if [ -n "$RET" ]; then
@@ -140,9 +127,23 @@
         # line.
         sed -ri "s|^([[:space:]]+)(#+[[:space:]]*)?(generator:[[:space:]]+https?://)[^:/]+|\1\3$HOSTPART|" /etc/maas/pserv.yaml
     fi
+}
+
+
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+    # logging
+    create_log_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
+
+    configure_pserv_generator
+
     # These config files may contain a private cluster UUID.  Only maas
     # can read them; only root can write them
     chown root:maas \

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2014-02-07 16:24:38 +0000
+++ debian/patches/02-pserv-config.patch	2014-02-15 21:26:52 +0000
@@ -3,8 +3,10 @@
  include port, logfile, oops directory, cobbler url and username
 Author: Andres Rodriguez <[e-mail]>
 
---- maas-1.5+bzr1908.orig.orig/etc/maas/pserv.yaml	2014-02-07 11:21:21.686557887 -0500
-+++ maas-1.5+bzr1908.orig/etc/maas/pserv.yaml	2014-02-07 11:21:21.678557887 -0500
+Index: maas-1.5+bzr1948.orig/etc/maas/pserv.yaml
+===================================================================
+--- maas-1.5+bzr1948.orig.orig/etc/maas/pserv.yaml	2014-02-15 12:08:35.152998981 -0500
++++ maas-1.5+bzr1948.orig/etc/maas/pserv.yaml	2014-02-15 12:08:35.148998981 -0500
 @@ -6,7 +6,7 @@
  ## running server.
  #
@@ -32,5 +34,5 @@
    # generator: http://localhost/MAAS/api/1.0/pxeconfig/
 -  generator: http://localhost:5243/api/1.0/pxeconfig/
  
- ## RPC configuration, for region<-->cluster communications.
- #
+ ## Boot configuration.
+ boot: