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

[Andres Rodriguez]

* debian/maas-region-controller.config: Ensure dbc_go is not run when dbconfig common is not yet installed.
* debian/maas-region-api.postinst: Ensure rsyslog is restarted.
* debian/maas-region-controller.postinst: Ensure maas_url ends with 5240.

[Gavin Panella (allenap)]

Some questions, but +1 so you're not blocked.

review: Approve

[LaMont Jones (lamont)]

Some mostly aesthetic comments, but would like to at least discuss them before saying "approve"

review: Needs Information

[Christian Reis (kiko)]

On Fri, Jun 17, 2016 at 02:27:26PM -0000, Andres Rodriguez wrote:
> - maas-region local_config_set \
> - --maas-url "http://${ipaddr}/MAAS"
> + local port=$(echo "$1" | cut -d":" -f2)
> + if [ -z "$port" ]; then
> + # MAAS bind's to port 5240. If no port specified as part of

binds, not bind's.

> + # 'ipaddr', we set as such.
> + maas-region local_config_set \
> + --maas-url "http://${ipaddr}:5240/MAAS"
> + else
> + maas-region local_config_set \
> + --maas-url "http://${ipaddr}/MAAS"
> + fi

Also, a nit, but why not:

    [...]

    if [ -z "$local_port" ]; then
        # Ensure MAAS binds to port 5240 by default
        ipaddr=${ipaddr}:5240
    fi

    maas-region local_config_set \
            --maas-url "http://${ipaddr}/MAAS"

[Andres Rodriguez (andreserl)]

comments inline!

review: Approve

[lp:~andreserl/maas/packaging_dbc_go]

507. By Andres Rodriguez on 2016-06-17

Address kiko's suggestions

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-16 15:27:18 +0000
+++ debian/changelog	2016-06-17 17:46:33 +0000
@@ -1,12 +1,16 @@
-maas (2.0.0~beta8+bzr5120-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~beta8+bzr5132-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New upstream release, 2.0.0 RC1 bzr:
   * /etc/maas/templates/dns is obsolete. (LP: #1581729)
   * Switch to OpenSSH for SSH public key validation. Previously
     Twisted's conch was used but it does not yet support the newer ecdsa
     and ed25519 key types. (LP: #1590081)
   * debian/control: maas-region-api depends on maas-cli.
+  * debian/maas-region-api.postinst: Ensure rsyslog is restarted.
+  * debian/maas-region-controller.postinst: Ensure maas_url ends with 5240.
   * Versioned Depend on squid
+  * debian/maas-region-controller.config: Ensure dbc_go is not run when
+    dbconfig common is not yet installed.
 
  -- Andres Rodriguez <[e-mail]>  Tue, 14 Jun 2016 17:08:48 -0400
 

=== modified file 'debian/maas-region-api.postinst'
--- debian/maas-region-api.postinst	2016-05-25 08:53:05 +0000
+++ debian/maas-region-api.postinst	2016-06-17 17:46:33 +0000
@@ -32,6 +32,10 @@
     mkdir -p /var/log/maas/rsyslog
     chown -R syslog:syslog /var/log/maas/rsyslog
 
+    # Make sure rsyslog reads our config after creating the
+    # destination folder.
+    systemctl restart rsyslog >/dev/null 2>&1 || true
+
     # apache2 log symlinks
     ln -sf /var/log/apache2 /var/log/maas/
 }

=== modified file 'debian/maas-region-controller.config'
--- debian/maas-region-controller.config	2016-03-07 22:01:56 +0000
+++ debian/maas-region-controller.config	2016-06-17 17:46:33 +0000
@@ -33,7 +33,9 @@
     dbc_dbuser="maas"
     dbc_remove="true"
 
-    dbc_go maas-region-controller $@
+    if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
+        dbc_go maas-region-controller $@
+    fi
 
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     db_get maas/default-maas-url || true

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2016-04-07 16:39:41 +0000
+++ debian/maas-region-controller.postinst	2016-06-17 17:46:33 +0000
@@ -21,6 +21,11 @@
 
 configure_maas_default_url() {
     local ipaddr="$1"
+    local local_port=$(echo "$ipaddr" | cut -d":" -f2)
+    if [ -z "$local_port" ]; then
+        # Ensure MAAS binds to 5240 by default.
+        ipaddr=${ipaddr}:5240
+    fi
     maas-region local_config_set \
         --maas-url "http://${ipaddr}/MAAS"
 }