Merge lp:~mpontillo/maas/bug-1459876-packaging into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Run the 'maas-region-admin purge_unused_images' command at the same time as database migrations occur, so that deleted MAAS images don't endlessly grow the database.

This change depends on the following MP:

https://code.launchpad.net/~mpontillo/maas/database-vacuum-bug-1459876/+merge/260910

With this change to the packaging, we'll vacuum the database whenever an upgrade occurs (just after we migrate the database).

This allows us a window to clean up the database without affecting MAAS functionality.

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1595 @@
+maas (1.8.0~rc2+bzr3972-0ubuntu1) UNRELEASED; urgency=medium
+
+  * UNRELEASED
+
+  [ Mike Pontillo ]
+  * Run the 'maas-region-admin purge_unused_images' command at the same
+    time as database migrations occur, so that deleted MAAS images
+    don't endlessly grow the database. (LP: #1459876)
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 02 Jun 2015 09:27:54 -0400
+
+maas (1.8.0~rc1+bzr3972-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0 RC1 bzr3972.
+  * debian/copyright: Add copyright headers for ng-tags-input.js.
+  * debian/control: Bump Standards-Version
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 27 May 2015 20:16:40 -0400
+
+maas (1.8.0~beta8+bzr3951-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0 beta 8 bzr3951.
+
+  [ Raphaël Badin ]
+  * debian/extras/99-maas-sudoers: Allow maas to check the status of
+    maas-dhcpd and maas-dhcp6 and start these services (LP: #1457708).
+
+  [ Andres Rodriguez ]
+  * debian/rules: Ensure maas-regiond-worker is not started in packaging.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 21 May 2015 19:18:22 -0400
+
+maas (1.8.0~beta7+bzr3926-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0 beta 7 bzr3926.
+
+  [ Andres Rodriguez ]
+  * debian/{maas-cluster-controller,maas-common,
+    maas-region-controller-min}.postinst: Cleaned up to correctly create
+    log dir permissions (LP: #1457191)
+
+  [ Gavin Panella ]
+  * Create maas-regiond workers for systemd.
+
+ -- 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:
+
+  [ Gavin Panella ]
+  * Drop the use of daemontools in favor of having upstart track
+    thread processes:
+    - d/maas-region-controller-min.maas-regiond.upstart: Drop use of
+      daemontools; use maas-regiond-worker
+    - d/maas-region-controller-min.maas-regiond-worker.upstart: Add.
+    - d/control: Drop depends on daemontools.
+
+  [ Andres Rodriguez ]
+  * debian/maas-common.{postinst,logrotate}: Create maas.log if non-existent
+    and add log rotation, provided maas.log exists both in the Region
+    and in the Cluster (LP: #1381603)
+
+ -- Andres Rodriguez <[e-mail]>  Sat, 09 May 2015 15:03:17 +0100
+
+maas (1.8.0~beta5+bzr3867-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0 Beta 5 bzr3867.
+
+  [ Andres Rodriguez ]
+  * d/p/02-pserv.yaml: Fix config file (LP: #1449862)
+
+  [ Mike Pontillo ]
+  * Run DNS reconfiguration if either 'forwarders' or 'dnssec-validation'
+    keywords exist in named.conf.options (LP: #1384334)
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 24 Apr 2015 18:55:47 -0400
+
+maas (1.8.0~beta4+bzr3844-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release. 1.8.0 Beta 4 bzr2344
+  * debian/maas-dhcpd.maas-dhcpd.service: Remove whitespace in unit that
+    was making systemd crash (LP: #1446699)
+  * debian/maas-proxy.maas-proxy.service: Fix proxy to correctly run
+    pre-start script.
+  * debian/maas-dns.postinst: Ensure permissions are fixed also on upgrade.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 21 Apr 2015 13:00:49 -0400
+
+maas (1.8.0~beta3+bzr3825-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release. 1.8.0 Beta3 bzr3825 (LP: #1432666):
+    - Fixx issues with concurrent DB access and the isolation level
+      that made MAAS unusable in highload environments. 
+
+  [ Gavin Panella ]
+  * Run one maas-regiond per CPU core.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 16 Apr 2015 21:26:21 +0200
+
+maas (1.8.0~beta2+bzr3814-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release. 1.8.0 Beta2 bzr3814.
+
+  [ Andres Rodriguez ]
+  * Restart apache2 after the region is restarted on a install. (LP: #1438782)
+
+  [ Mike Pontillo ]
+  * Stop maas-clusterd in prerm so that database purge succeeds (LP: #1044559)
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 06 Apr 2015 11:00:00 -0400
+
+maas (1.8.0~beta1+bzr3777-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release. 1.8.0 Beta1 bzr 3777.
+
+  [ Mike Pontillo ]
+  * debian/extras/maas-region-admin: Fix Path setting.
+  * debian/control: Properly depend on python-apt
+
+  [ Andres Rodriguez ]
+  * debian/maas-dhcp.maas-dhcpd[6].service: Fix units to correctly run
+    in vivid.
+  * debian/maas-proxy.maas-proxy.service: Fix unit to use correct daemon.
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 30 Mar 2015 19:17:47 -0400
+
+maas (1.8.0~alpha9+bzr3750-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release. MAAS 1.9.0 Alpha 9 bzr3692:
+    - fix bulk actions for isolation level changes.
+    - fix commissioning related isolation level / transaction issues.
+
+  [ Andres Rodriguez ]
+  * Make sure MAAS works with python-django16 in vivid.
+
+  [Gavin Panella]
+  * debian/extras/99-maas-sudoers
+    debian/maas-cluster-controller.install
+    - Do not install maas-import-pxe-files; it is no longer used, and is
+      not present in upstream.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 20 Mar 2015 20:27:02 -0400
+
+maas (1.8.0~alpha8+bzr3692-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha8 bzr 3692:
+    - Fix bulk actions to not fail due to transaction errors.
+
+  [ Steve Langasek ]
+  * Depend on pxelinux for pxelinux.0, not on syslinux-dev. (LP: #1433697)
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 17 Mar 2015 18:46:41 -0400
+
+maas (1.8.0~alpha7+bzr3664-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha7 bzr3664
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 10 Mar 2015 16:36:40 -0400
+
+maas (1.8.0~alpha6+bzr3625-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha6 bzr3625:
+    - Add ability to select OS when we Deploy via a bulk action.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 06 Mar 2015 18:10:46 -0500
+
+maas (1.8.0~alpha5+bzr3609-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha5 bzr3601:
+    - Add new 'Devices' page in the WebUI.
+    - Add support for VMWare's vSphere.
+  * debian/control:
+    - Add Depends on python-pyvmomi; Drop Depends on python-pyscss.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 05 Mar 2015 11:31:14 -0500
+
+maas (1.8.0~alpha4+bzr3581-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha4 bzr3581:
+    - Adds new 'Add Hardware' button on the WebUI.
+    - Adds new 'Add Chassis' button on the WebUI.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 27 Feb 2015 19:50:00 -0500
+
+maas (1.8.0~alpha3+bzr3568-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha3 bzr3568
+    - Adds support for Microsoft OCP Chassis.
+  * debian/control:
+    - Add python-bson as a depends.
+    - Remove python-pyscss as a build dependency.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 24 Feb 2015 15:47:07 -0500
+
+maas (1.8.0~alpha2+bzr3545-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha2 bzr3545
+  * debian/control:
+    - Depends on libjs-angularjs (LP: #1423457)
+    - Depends on ubuntu-cloudimage-keyring for region (LP: #1424287)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 18 Feb 2015 16:31:02 -0500
+
+maas (1.8.0~alpha1+bzr3523-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0~alpha1 bzr3523
+
+  [ Blake Rouse ]
+  * debian/control: added python-pyscss as a build dependency.
+  * debian/rules: build scss files to maas-styles.css and remove scss files
+    from the static files directory.
+
+  [ Jeroen Vermeulen ]
+  * debian/maas-cluster-controller.postinst: configure MAAS_URL through new
+    "maas-provision configure-maas-url" sub-command instead of with "sed".
+
+  [ Andres Rodriguez ]
+  * Set 'maas' homedir to '/var/lib/maas' (LP: #1399016):
+    - debian/maas-common.postinst: Do not try to update 'maas'
+      home user dir on upgrade.
+  * debian/control: Tighten Dependency versioning of some packages.
+  * debian/maas-region-controller-min.preinst: Handle upgrades to remove
+    legacy files.
+  * debian/maas-region-controller{-min}.postinst: Simplify postinsts.
+  * Drop depends on python-celery, python-oops, python-oops-twisted,
+    python-oops-datedir-repo, python-oosp-wsgi
+  * Drop maas-cluster-http.conf; Drop depends on apache2 for
+    maas-cluster-controller.
+
+  [ Gavin Panella ]
+  * debian/maas-region-controller-min.maas-regiond.upstart
+    - Upstart script for the new maas-regiond.
+    - Use setuid/setgid to drop root privs before running script.
+    - Don't write a pid file.
+  * debian/maas-cluster-controller.maas-clusterd.upstart
+    - Start maas-clusterd; it's no longer called maas-pserv.
+  * debian/maas-region-controller-min.install
+    - Don't install wsgi.py; it's no longer used.
+  * debian/rules
+    - Install maas-regiond plugin.
+  * debian/maas-region-controller-min.apport
+    debian/maas-region-controller-min.logrotate
+    debian/maas-region-controller-min.postinst
+    debian/maas-region-controller.postinst
+    - Change maas-django.log to regiond.log.
+  * debian/maas-region-controller.postinst
+    - Restart maas-regiond after installation.
+    - a2enmod rewrite module (LP: #1236544)
+  * debian/maas-region-controller.postinst
+    - Restart maas-regiond after installation.
+  * debian/control
+    debian/maas-region-controller-min.postinst
+    debian/maas-region-controller.postinst
+    - mod_wsgi is no longer used.
+  * debian/maas-region-controller-min.logrotate
+    - No longer used; maas-regiond uses rotatelogs.
+    - a2enmod rewrite module (LP: #1236544)
+  * debian/patches/01-fix-database-settings.patch
+    - Move STATIC_ROOT setting upstream.
+    - Simplify database configuration hunk.
+  * debian/maas-cluster-controller.logrotate
+    debian/maas-region-controller.logrotate
+    - Use copytruncate; even though it's sub-optimal, this is currently
+      the best way to integrate logrotate with twistd.
+    - Limit the size of the logs to 50MB, but don't rotate unless
+      they're more than 10MB.
+    - Drop privileges and run as maas/maas.
+  * debian/maas-region-controller-min.maas-regiond.upstart
+    debian/maas-cluster-controller.maas-clusterd.upstart
+    - Redirect stdout and stderr from twistd directly to the daemon's
+      respective log file.
+  * debian/maas-region-controller-min.apport
+    - pserv.log has been renamed to clusterd.log.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 14 Nov 2014 09:04:29 -0500
+
+maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release, 1.7.0.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 14 Nov 2014 08:38:39 -0500
+
+maas (1.7.0~rc3+bzr3299-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release, RC3 bzr 3299
+    - Fix dashboard tooltip messages which had stopped being displayed
+      (LP: #1390434)
+
+ -- Julian Edwards <[e-mail]>  Tue, 11 Nov 2014 12:23:07 +1000
+
+maas (1.7.0~rc2+bzr3297-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release, RC2 bzr 3297
+    - Allow marking a node in the DISK_ERASING state as broken (LP: #1388919)
+    - Prevent concurrent allocations of static IP addresses from returning
+      the same clashing address. (LP: #1387262)
+
+  [ Andres Rodriguez ]
+  * debian/maas-cluster-controller.postinst: Make sure that cluster sets
+    the correct permissions for proxy log dir if running on the same
+    system. (LP: #1377964)
+
+ -- Julian Edwards <[e-mail]>  Fri, 07 Nov 2014 09:30:52 +1000
+
+maas (1.7.0~rc1+bzr3295-0ubuntu1) trusty; urgency=medium
+
+  * New Upstream Release, RC1 bzr 3295
+    - If using MSCM (Moonshot Chassis Manager) on a M300, do not overwrite
+      power parameters (LP: #1382075)
+    - Do not write DNS hostmaps if its PXE Mac is not on a managed cluster
+      interface. (LP: #1382108)
+    - Show os field in boot source selections API. (LP: #1384383)
+    - Add documentation for new Import Images features (LP: #1384010)
+    - Allow releasing if Failed to Disk Wipe or Release (LP: #1384821)
+    - Handle missing subarch when creating a node via RPC for
+      probe-and-enlist methods (LP: #1384778)
+    - Update default waiting policy for power actions to increase time of
+      wait to handle different type of BMC's (LP: #1384758)
+    - Use HTTP_PROXY to download images if configured (LP: #1384464)
+    - Return 503 response for PowerActionAlreadyInProgress and add a
+      'Retry-after' Header. (LP: #1384001)
+    - Stop ImportResourcesService from crashing when an import fails
+      (LP: #1386722)
+    - Convert TFTP request paths that contain backslashes to forward
+      slashes. (LP: #1387191)
+    - Do not try to delete synced boot images if not new ones are present
+      to handle a weird race. (LP: #1387133)
+    - Fix storage unit shown on the node edit page (LP: #1387431)
+    - Use CompressedAmpList in UpdateLeases to now parse
+      ~3500 leases (LP: #1387515, LP: #1387515)
+    - Updated XPath expression for discovering storage capacity from new
+      lshw changes. (LP: #1387380)
+    - Add sub status field on API.
+    - Generate DNS mappings for the Dynamic IP range. Hostname generation
+      is limited to /16. (LP: #1382190)
+    - Use configured HTTP Proxy to download boot images (LP: #1384464)
+  * debian/extras/maas-proxy-common.sh: Ensure that permissions are correct
+    before starting maas-proxy. (LP: #1382266)
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 27 Oct 2014 21:53:43 -0400
+
+maas (1.7.0~beta8+bzr3272-0ubuntu1) utopic; urgency=medium
+
+  * New Upstream Release, Beta 8 bzr 3272.
+    - Maintain backward compatibility with status codes to not break
+      client MAAS API users.  (LP: #1383609)
+    - Allow users to disable DHCP NIC scanning during commissioning otherwise
+      this can lead machines not being able to commission (LP: #1383384)
+    - Ensure that MAAS can correctly download, and install HWE Kernels, and
+      not crash in the process. (LP: #1357532, LP: #1382281)
+    - Add a lock to ensure we don't give the same 2 systems to two different
+      users when acquiring a machine. (LP: #1382575)
+
+  [ Michael McCracken ]
+  * debian/maas-dns.postrm: ensure named.conf is cleaned of maas
+    includes (LP: #1346538)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 22 Oct 2014 12:55:08 -0400
+
+maas (1.7.0~beta7+bzr3266-0ubuntu1) utopic; urgency=medium
+
+  * New Upstream Snapshot, Beta 7 bzr3266
+
+  [ Jeroen Vermeulen ]
+  * debian/extras/99-maas-sudoers
+    debian/maas-dhcp.postinst
+    debian/rules
+    - Add second DHCP server instance for IPv6.
+  * debian/maas-region-controller-min.install
+    debian/maas-region-controller-min.lintian-overrides
+    - Install deployment user-data: maas_configure_interfaces.py script.
+  * debian/maas-cluster-controller.links
+    debian/maas-cluster-controller.install
+    debian/maas-cluster-controller.postinst
+    - Reflect Celery removal changes made in trunk r3067.
+    - Don't install celeryconfig_cluster.py any longer.
+    - Don't install maas_local_celeryconfig_cluster.py any longer.
+    - Don't symlink maas_local_celeryconfig_cluster.py from /etc to /usr.
+    - Don't insert UUID into maas_local_celeryconfig_cluster.py.
+
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller-min.postrm: Cleanup lefover files.
+  * debian/maas-dhcp.postrm: Clean leftover configs.
+  * Provide new maas-proxy package that replaces the usage of
+    squid-deb-proxy:
+    - debian/control: New maas-proxy package that replaces the usage
+      of squid-deb-proxy; Drop depends on squid-deb-proxy.
+    - Add upstrart job.
+    - Ensure squid3 is stopped as maas-proxy uses a caching proxy.
+  * Remove Celery references to cluster controller:
+    - Rename upstart job from maas-pserv to maas-cluster; rename
+      maas-cluster-celery to maas-cluster-register. Ensure services
+      are stopped on upgrade.
+    - debian/maintscript: Cleanup config files.
+    - Remove all references to the MAAS celery daemon and config
+      files as we don't use it like that anymore
+  * Move some entries in debian/maintscript to
+    debian/maas-cluster-controller.maintscript
+  * Remove usage of txlongpoll and rabbitmq-server. Handle upgrades
+    to ensure these are removed correctly.
+
+  [ Jason Hobbs ]
+  * debian/maas-region-controller-min.install: Install
+    maas-generate-winrm-cert script.
+
+  [ Raphaël Badin ]
+  * debian/extras/maas-region-admin: Bypass django-admin as it prints
+    spurious messages to stdout (LP: #1365130).
+
+  [Louis Bouchard]
+  * debian/maas-cluster-controller.postinst:
+    - Exclude /var/log/maas/rsyslog when changing ownership
+      (LP: #1346703)
+
+  [Gavin Panella]
+  * debian/maas-cluster-controller.maas-clusterd.upstart:
+    - Don't start-up the cluster controller unless a shared-secret has
+      been installed.
+  * debian/maas-cluster-controller.maas-cluster-register.upstart: Drop.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 21 Aug 2014 19:36:30 -0400
+
+maas (1.7.0~beta1+bzr2781-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release, 1.7.0 Beta 1
+
+  [Diogo Matsubara]
+  * debian/control:
+    - maas-cluster-controller depends on syslinux-dev |
+      syslinux-common (LP: #1328659)
+    - python-maas-provisioningserver depends on
+      python-paramiko (LP: #1334401)
+
+  [Jeroen Vermeulen]
+  * debian/extras/99-maas-sudoers:
+    - Let maas user import, including sudo tgt-admin and sudo uec2roottar.
+  * debian/maas-cluster-controller.install:
+    - Stop installing obsolete file bootresources.yaml.
+
+  [ Raphaël Badin ]
+  * debian/control:
+    - maas-cluster-controller depends on python-pexpect
+  * debian/extras/99-maas-sudoers:
+    - Add rule 'maas-dhcp-server stop' job.
+
+  [ Greg Lutostanski ]
+  * debian/control:
+    - maas-cluster-controller depends on grub-common
+    - maas-provisioningserver not maas-cluster-controller depends on
+      python-pexpect (LP: #1352273)
+    - maas-provisioningserver not maas-cluster-controller depends on
+      python-seamicroclient (LP: #1332532)
+
+  [ Gavin Panella ]
+  * debian/maas-cluster-controller.postinst
+    - Allow maas-pserv to bind to all IPv6 addresses too.
+
+  [ Julian Edwards ]
+  * debian/maas-region-controller-min.apport
+    debian/maas-region-controller-min.logrotate
+    debian/maas-region-controller-min.postinst
+    debian/maas-region-controller.postinst
+    - Change the log file name maas.log to maas-django.log
+  * debian/maas-cluster-controller.postinst
+    debian/maas-common.install
+    debian/maas-region-controller-min.postinst
+    debian/maas-region-controller.postinst
+    - Install /var/log/maas/maas.log as a syslog file.
+    - Ensure logging is set up for upgrades
+
+  [ Graham Binns ]
+  * debian/maas-region-controller.postinst:
+    - Add symlinks for squid3, squid-deb-proxy and apache log directories to
+      /var/log/maas.
+
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller.postinst: Force symlink creation
+    for external logs.
+  * debian/maas-region-controller.postinst: Do not change celery's
+    rabbitmq password on upgrade that to not lock remote
+    Cluster Controllers if upgrading from 1.5+. (LP: #1300507)
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 21 Aug 2014 14:05:40 -0400
+
+maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release
+    - Add support to install Third Party Drivers. In order for this to be
+      used the user will have to go to the Settings page to enable the
+      installation of these drivers. (LP: #1305839)
+    - Use release images instead of daily. (LP: #1306701)
+    - Quote interface name in dhcpd.template, otherwise DHCP server fails
+      to start. (LP: #1306335)
+    - Fix IntegrityError, when multiple processes are trying to register
+      the same component. (LP: #1307415)
+    - Add missing armhf commissioning template (LP: #1307780)
+  * debian/maas-region-controller-min.install: Install drivers.yaml.
+  * debian/maas-region-controller.postinst: No longer show the
+    installation note by default. (LP: #1284652)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 09 Apr 2014 19:02:00 -0400
+
+maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release.
+    - Fix simplestreams path to use the new data source path. (LP: #1305118)
+    - Fix commissioning_distro_series validation failure. (LP: #1304408)
+    - Fix DB migration 0072_remove_ipmi_autodetec. (LP: #1302156)
+    - Update documentation.
+  * debian/maas-region-controller-min.maas-region-celery.upstart,
+    debian/maas-region-controller-min.maas-txlongpoll.upstart: Fix ISO
+    install by making sure rabbitmq user is really created if it does not
+    exist (LP: #1298559)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 09 Apr 2014 18:36:55 -0400
+
+maas (1.5+bzr2230-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release:
+    - Fix Cluster Controller to handle deprecated config items gracefull.
+      Otherwise it fails on upgrades. (LP: #1302772)
+    - Fix documentation generation and referencing. (LP: #1302956)
+    - Ensure we PXE boot when we turn on SM15K systems. (LP: #1303915)
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 07 Apr 2014 10:26:51 -0400
+
+maas (1.5+bzr2227-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release:
+    - Fix catching exceptions raised by
+      twisted.conch.ssh.keys.Key.fromString (LP: #1298788)
+    - Fix validationg in default NodeGroupInterface.broadcast_ip making it
+      optional. (LP: #1299374)
+    - Drop install-pxe-bootloader as it conflicts with newer import script.
+    - Remove references to old import script.
+    - Fix changes that cause overwriting of existing entries.
+    - Fix inappropriate ValidationError when defining networks with nested
+      (but non-identical) address ranges. (LP: #1299114)
+    - Fix issue where if a node does not provide an architecture type on dhcp
+      request, or no other boot method is available for that architecture,
+      the node still uses pxelinux.0 to boot. (LP: #1300285)
+    - Take an advisory lock to prevent concurrent creation of the
+      eventloops table. (LP: #1300363)
+    - Remove the cloud_images_archive setting, as it conflicts with new
+      import script. (LP: #1300587)
+    - Add a 'logout confirmation' page. Using this, the logout action is
+      protected against CSRF attacks because it uses a POST request, in
+      conjunction with Django's CSRF protection feature. (LP: #1298790)
+    - Fix cluster listings when dealing with large number of clusters by
+      paginating it. (LP: #1301242)
+    - Change list_boot_images() so that it can cope with a missing boot
+      images directory: this happens if the reporting task runs before the
+      images have been imported. (LP: #213984)
+    - Fix internal server error on fast path installer. (LP: #1293676)
+    - Fix uploading files using maas-cli. (LP: #1187826)
+    - Fix SM15k Invalid Power Control and Fix enlisting machines with
+      2.0 api. (LP: #1302818, LP: #1302819)
+
+  [ Andres Rodriguez ]
+  * debian/maas-cluster-controller.install: Install UEFI templates
+  * debian/maas-cluster-controller.dirs: Create 'boot-resources' dir.
+
+  [ Jason Hobbs ]
+  * debian/extras/99-maas: Allow access to keyserver.ubuntu.com via
+    squid-deb-proxy.
+
+  [Jeroen Vermeulen]
+  * debian/maas-cluster-controller.postinst:
+    - Make the tgt config link point to the new boot-resources dir.
+  * debian/maas-region-controller-min.dirs:
+    - Don't create /var/lib/maas/tftp.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 03 Apr 2014 13:45:02 -0400
+
+maas (1.5+bzr2204-0ubuntu1) trusty; urgency=low
+
+  * New upstream release (LP: #1281881)
+
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller-min.templates: Set installation note to false
+    by default.
+  * Check rabbitmqctl is present before running commands:
+    - debian/maas-region-controller-min.maas-region-celery.upstart.
+    - debian/maas-region-controller-min.maas-txlongpoll.upstart.
+  * make sure maas_longpoll rabbitmq user is created/with correct password on
+    a package reconfigure.
+  * debian/maas-dns.postinst: Fix upgrade setup of named.conf.options.
+  * debian/maas-cluster-controller.install: Install UEFI templates (LP: #1299143)
+
+  [ Julian Edwards ]
+  * debian/extas/maas: Echo warning to stderr so json stdout is not polluted
+  * debian/maas-cluster-controller.postinst: Run upgrade-cluster on each
+    upgrade
+  * debian/maas-dns.postinst: Call edit_named_options to add a line in
+    /etc/bind/named.conf.options that includes the
+    /etc/named/maas/named.conf.options.inside.maas file.
+  * debian/control:
+    - maas-dns depends on python-iscpy
+    - maas-cluster-controller depends on python-seamicroclient
+  * debian/maas-cluster-controller.install: Install bootresources.yaml
+
+  [ Dustin Kirkland ]
+  * debian/control: LP: #1297097
+    - clean up package descriptions, modernize, and more clearly/simply
+      explain what each package does
+    - drop "Ubuntu" in front of MAAS, clean up command line/API description
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 28 Mar 2014 10:43:53 -0400
+
+maas (1.5+bzr1977-0ubuntu1) trusty; urgency=low
+
+  * New upstream bugfix release.
+    - setup.py: Install missing shell snippet
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 19 Feb 2014 16:31:45 -0500
+
+maas (1.5+bzr1976-0ubuntu1) trusty; urgency=low
+
+  * New upstream release.
+  * debian/maas-cluster-controller.postinst: Make sure upgrades handle
+    authbind upgrades too.
+
+ -- Andres Rodriguez <[e-mail]>  Sun, 16 Feb 2014 22:56:36 -0500
+
+maas (1.5+bzr1951-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+  * debian/maas-cluster-controller.postinst: Also authbind port 69.
+  * debian/maas-cluster-controller.maas-pserv.upstart: Export MAAS_URL.
+
+ -- 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.
+
+  [ 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
+    a deprecation warning in favour of using maas over maas-cli.
+  * debian/extras/maas renamed to debian/extras/maas-region-admin
+  * debian/maas-cli.install: install debian/extras/maas
+  * debian/maas-dns.postinst: Invoke maas-region-admin instead of maas
+  * debian/maas-region-controller-min.install: install maas-region-admin
+    instead of maas
+  * debian/maas-region-controller.postinst: Invoke maas-region-admin instead
+    of maas
+  * debian/maas-cli.links: Link from maas to maas-cli for backward compat.
+
+  [ Seth Arnold ]
+  * debian/maas-region-controller-min.postinst: Make sure txlongpoll.yaml
+    gets correct permissions on upgrade (LP: #1254034)
+
+ -- Andres Rodriguez <[e-mail]>  Sat, 15 Feb 2014 12:08:23 -0500
+
+maas (1.5+bzr1909-0ubuntu1) trusty; urgency=low
+
+  * New upstream release.
+
+  [ Dustin Kirkland ]
+  * debian/maas-region-controller-min.postinst: Fix typo in sed. Remove
+    double quotes. (LP: #1274448)
+
+  [ Andres Rodriguez ]
+  * debian/control: Add depends on python-crochet.
+  * Get rid of dfsg on the versioning as we no longer strip any code from
+    the orig tarball.
+    - debian/rules: Do not strip any files out of the tarball.
+  * debian/patches/*: Refreshed.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 31 Jan 2014 09:38:51 -0500
+
+maas (1.4+bzr1853+dfsg-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
+ -- Dustin Kirkland <[e-mail]>  Tue, 28 Jan 2014 08:41:41 +0000
+
+maas (1.4+bzr1849+dfsg-0ubuntu1) trusty; urgency=low
+
+  * New upstream release.
+
+  [ Gavin Panella ]
+  * debian/control: Remove all dependencies on Avahi and DBUS.
+
+ -- Julian Edwards <[e-mail]>  Tue, 28 Jan 2014 17:12:22 +1000
+
+maas (1.4+bzr1820+dfsg-0ubuntu1) trusty; urgency=low
+
+  * New upstream Release.
+
+  [ Jeroen Vermeulen ]
+  * Move maas-probe-dhcp from maas-dhcp to python-maas-provisioningserver.
+
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller.postinst: Make sure maas-txlongpoll and
+    maas-region-celery get restarted.
+  * debian/control:
+    - python-maas-provisioningserver Breaks/Replaces for maas-dhcp due to
+      moving files around packages.
+    - Suggests ipmitool, libvirt-bin, amtterm.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 15 Jan 2014 00:24:58 -0500
+
+maas (1.4+bzr1817+dfsg-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
+  [ Andres Rodriguez ]
+  * debian/maas-dns.postinst: Drop write_dns_config as this is run by
+    celery jobs.
+  * debian/maas-region-controller.templates: Rename template to
+    maas-region-controller-min.templates
+  * debian/control: Depends on python-amqp; Conflicts on python-librabbitmq.
+
+  [ Julian Edwards ]
+  * New maas-probe-dhcp script to detect DHCP servers
+    - debian/extras/maas-probe-dhcp: New script
+    - debian/maas-dhcp.install: Install new maas-probe-dhcp script
+    - maas-dhcp.lintian-overrides: New maas-probe-dhcp script has no manpage
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 15 Jan 2014 00:23:44 -0500
+
+maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
+  [ Jeroen Vermeulen ]
+  * Keep legacy import_ephemerals config for now.
+
+  [ Andres Rodriguez ]
+  * debian/maas-region-controller.postinst: Allo default-maas-url debconf
+    option to be preseeded.
+  * Make use of authbind to allow maas-cluster-celery bind port as non-root.
+    - debian/control: Depends on authbind for maas-cluster-controller.
+    - debian/maas-cluster-controller.{postinst,postrm}: Handle creation
+      and removal of required authbind file.
+  * Split maas-region-controller into maas-region-controller-min.
+    - debian/maas-region-controller-min.{postinst,postrm,prerm}: Handle
+      basic configuration for rsyslogd, squid-deb-proxy, and maas-url.
+    - debian/control: Depends on maas-region-controller-min, postgresql
+      and rabbitmq-server for maas-region-controller.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 10 Oct 2013 17:07:51 -0400
+
+maas (1.4+bzr1693+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New Upstream Release (LP: #1218526)
+    - This new upstream release contains fixes and improvements of the
+      features approved by the FFe above.
+    - Fixes commissioning failure on Saucy with 'Failed Test' (LP: #1237364)
+    - Fixes access of static images over http  (LP: #1236544)
+  * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544)
+  * d/control: Bump depends on python-django to 1.4. (LP: #1236572)
+  * d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing
+    to install maas-dhcp during an ISO install. (LP: #1236786)
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 04 Oct 2013 12:33:05 -0400
+
+maas (1.4+bzr1656+dfsg-0ubuntu2) saucy; urgency=low
+
+  * debian/control: Recommends on maas-dns instead of Depends for region
+    because maas-dns needs the region installed first.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 03 Oct 2013 10:36:20 -0400
+
+maas (1.4+bzr1656+dfsg-0ubuntu1) saucy; urgency=low
+
+  [ Andres Rodriguez ]
+  * New upstream bugfix release.
+    - Respect filters for ephemerals_script.py.
+  * debian/control: Depends on ubuntu-cloudimage-keyring instead of
+    ubuntu-cloud-keyring; depends on python-distro-info.
+  * debian/control: Remove suggests on maas-dhcp and maas-dns as they are
+    now dependencies.
+
+  [ Scott Moser ]
+  * debian/control: Bump depends on isc-dhcp-server to 4.2.4
+  * debian/maas-dhcp.maas-dhcp-server.upstart: Change ownership of leases
+    file to root:root, and run the daemon as dhcpd:dhcpd.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 01 Oct 2013 15:26:34 -0400
+
+maas (1.4+bzr1655+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New Upstream release. (LP: #1218526)
+  * debian/control:
+    - Depends on python-djorm-ext-pgarray, python-curtin,
+      python-simplestreams, ubuntu-cloud-keyring.
+    - Depends on maas-dns, maas-dhcp to get them seeded and
+      into main (LP: #1227353)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 28 Aug 2013 11:17:44 -0400
+
+maas (1.4+bzr1551+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 15 Aug 2013 16:20:41 -0400
+
+maas (1.4+bzr1548+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 18 Jul 2013 10:15:10 -0400
+
+maas (1.4+bzr1539+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Symlink apache2 config into /etc/apache2/conf-enabled/ instead of
+    /etc/apache2/conf.d as apache2.4 no longer supports the latter.
+    - debian/maas-cluster-controller.{postinst,postrm}
+    - debian/maas-region-controller.{postinst,postrm}
+  * debian/control: Bump Standards-Version to 3.9.4.
+  * debian/maas-cluster-controller.lintian-overrides: Remove unneeded
+    override and add a new one.
+  * debian/maas-region-controller.lintian-overrides: Add extra overrides.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 03 Jul 2013 17:11:02 -0400
+
+maas (1.4+bzr1538+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * debian/patches/04-setup-dont-user-list-snippets.patch: Drop. Merged
+    Upstream.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 13 Jun 2013 20:06:35 -0400
+
+maas (1.4+bzr1527+dfsg-0ubuntu1) saucy; urgency=low
+
+  * debian/patches/04-setup-dont-user-list-snippets.patch: Drop importing
+    maasserver modules to list snippets in favor to using glob. Otherwise
+    we would have to add various non necessary Build-Dependencies.
+
+  [ Jeroen Vermeulen ]
+  * Install templates into /etc/maas/templates/.
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 03 Jun 2013 17:59:31 -0400
+
+maas (1.4+bzr1505+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+  [ Steve Langasek ]
+  * Add missing dependency on iproute to maas-region-controller, for use of
+    /sbin/ip in postinst.
+
+  [ Julian Edwards ]
+  * debian/maas-dhcp.maas-dhcp-server.upstart:
+    - Detect 12.04 as the host OS and install with correct permissions. This
+      allows the same packaging to be used in the 12.04 backport.
+
+  [ Andres Rodriguez ]
+  * Update packaging to support FPI:
+    - debian/control: Depends on apache2 for maas-cluster-controller.
+    - debian/maas-cluster-controller.install: Install http config file.
+    - debian/maas-cluster-controller.{postinst,postrm}: Handle symlink creation
+      and deletion.
+  * debian/maas-region-controller.install: Install preseeds in
+    etc/maas/preseeds. (LP: #1073463)
+
+  [ Jeroen Vermeulen ]
+  * In the source tree, /etc/maas/pserv.yaml has moved from etc/ to etc/maas/.
+  * Install templates into /etc/maas/templates/.
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 03 Jun 2013 16:53:14 -0400
+
+maas (1.3+bzr1455+dfsg-0ubuntu1) raring; urgency=low
+
+  * New upstream bugfix release.
+    - Fixes and returns the 'resource_url' with the 'canonical' url for
+      a file that is fetched using the API (LP: #1154142)
+
+  [ Andres Rodriguez ]
+  * debian/control:
+    - Change Conflicts/Replaces for Breaks/Replaces.
+    - Conflicts on tftpd-hpa and dnsmasq.
+    - Do not pre-depends, but Depends on ${misc:Depends} for 'maas'.
+
+  [ Steve Langasek ]
+  * postinst scripts are never called with 'reconfigure' as the script
+    argument.  Remove references to this (mythical) invocation.
+  * always call 'set -e' from maintainer scripts instead of passing 'sh -e'
+    as the interpreter, so that scripts will behave correctly when run via
+    'sh -x'.
+  * invoke-rc.d is never allowed to not exist - simplify scripts (and make
+    them better policy-compliant) by invoking unconditionally.  (The only
+    possible exception is in the postrm, where it's *theoretically* possible
+    for invoke-rc.d to be missing if the user has completely stripped
+    down their system; that's a fairly unreasonable corner case, but we
+    might as well be correct if it ever happens.)
+  * db_get+db_set is a no-op; don't call db_set to push back a value we just
+    got from db_get.
+  * Omit superfluous calls to 'exit 0' at the end of each script.
+  * Remove maas-cluster-controller prerm script, which called debconf for no
+    reason.
+  * Don't invoke debconf in the postrm script either, debhelper already does
+    this for us.
+  * Other miscellaneous maintainer script fixes
+  * debian/maas-common.postinst: call adduser and addgroup unconditionally;
+    the tools are already designed to DTRT, we don't need to check for the
+    user/group existence before calling them nor should we worry about
+    calling them only once on first install.
+  * debian/maas-common.postrm: delete the maas group, not just the user,
+    as the comment in the code implies we should do.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 19 Mar 2013 15:38:22 -0400
+
+maas (1.3+bzr1452+dfsg-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+    - MAAS file storage mechanism is shifting from a single shared
+      namespace to a per-user namespace. Operators of the majority
+      of MAAS systems will not notice any change. However, operators
+      of the most complex installations may find that a new
+      "shared-environment" user is created, and that some resources
+      are reassigned to it, such as API credentials and SSH public
+      keys. This provides a transitional environment that mimics the
+      behaviour of a shared namespace.
+
+  [ Raphaël Badin ]
+  * debian/control: maas-region-controller depends on bind9utils.
+    (LP: #1103195)
+  * debian/maas-dns.postinst: Call write_dns_config.
+    (LP: #1085865).
+  * debian/maas-cluster-controller.postinst: Fix the name of the config
+    file (/etc/maas/pserv.yaml and not /etc/maas/pserv.conf)
+    (LP: #1083542).
+  * debian/extras/99-maas-sudoers: Add 'SETENV:' to sudo rule
+    to allow preserving the environment when running
+    /usr/sbin/maas-import-pxe-files via sudo.
+  * debian/maas-dns.postinst: fix permissions and group ownership of
+    file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
+  * debian/control: Remove the dependency of maas-cluster-controller
+    on rabbitmq-server. (LP: #1072744)
+  * debian/extras/99-maas-sudoers: Add sudo rule for script
+    /usr/sbin/maas-import-pxe-files.
+  * debian/maas-cluster-controller.install: Removed commissioning-user-data
+    script.
+
+  [ Julian Edwards ]
+  * debian/maas-region-controller.install: Remove installation of maas-gc; it
+    is no longer required as upstream no longer stores files in the filesystem.
+    (LP: #1069734)
+  * debian/maas-cluster-controller.postinst: Ensure that /etc/maas/pserv.yaml
+    is updated when reconfiguring. (LP: #1081212)
+
+  [ Jeroen Vermeulen ]
+  * debian/maas-cluster-controller.install: Install import scripts.
+  * debian/maas-cluster-controller.postinst: Configure tgt (the iSCSI server)
+    so the import script can install files to it.
+  * debian/maas-cluster-controller.postrm: Clean up tgt config.
+  * debian/maas-region-controller.install: Move import scripts out to the
+    cluster controller, and drop the maas-import-isos compatibility script.
+  * debian/maas-region-controller.postinst: Remove tgt config.
+  * debian/maas-region-controller.postrm: Remove tgt config cleanup.
+  * Bump code revision to include latest user_data.template fixes.
+
+  [ Gavin Panella ]
+  * debian/extras/99-maas: squashfs image download is no longer needed.
+  * debian/maas-cluster-controller.install: maas-import-squashfs and its
+    configuration file are no longer part of upstream.
+  * debian/maas-cluster-controller.install: The maas-import-pxe-files cron
+    task is no longer used.
+  * debian/maas-cluster-controller.postinst: Remove leading comment
+    markers from the 'generator' line in pserv.yaml.
+
+  [ Andres Rodriguez ]
+  * debian/control:
+    - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
+    - maas-dns: Conflicts with dnsmasq
+    - maas-cluster-controller Conflicts/Replaces maas-region-controller as
+      import scripts are no longer shipped in the region.
+    - debian/control: Depends on distro-info for maas-cluster-controller
+      instead of maas-region-controller (LP: #1103194)
+  * debian/maas-cluster-controller.config: If URL has been detected,
+    add /MAAS if it doesn't contain it. This helps upgrades from versions
+    where DEFAULT_MAAS_URL didn't use /MAAS.
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 04 Mar 2013 11:49:44 -0500
+
+maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream bugfix release
+    - Fixes commissioning failing to set memory attribute. (LP: #1064638)
+    - Fixes node listing by adding pagination (LP: #1064672)
+    - Changes default bind rndc key which breaks initscripts (LP: #1066938)
+    - Fixes invalid DNS config once node is enlisted (LP: #1066958)
+    - Reference documentation link to correct URL (LP: #1067261)
+
+  [ Andres Rodriguez ]
+  * debian/rules: Change upstream branch.
+
+  [ Gavin Panella ]
+  * debian/maas-dns.postinst: Remove MAAS-related include lines from named's
+    config before adding a new one (LP: #1066929)
+
+  [ Raphael Badin ]
+  * debian/extras/maas-region-celeryd: Remove whitespace that affects DNS
+    rabbitmq queue. (LP: #1067929)
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 16 Oct 2012 10:31:37 -0400
+
+maas (0.1+bzr1264+dfsg-0ubuntu2) quantal; urgency=low
+
+  * Fix MAAS not working after CD/preseed install (LP: #1065763)
+    - debian/extras/maas-region-celeryd: Add wrapper to run celery from
+      the upstart job.
+    - debian/extras/maas-region-controller.maas-region-celery.upstart: Create
+      rabbitmq user if it does not exists.
+  * debian/control: Remove unneeded deps on python-txtftp for some binary pkgs.
+  * debian/maas-region-controller.postinst: Minor fix referencing variable.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 11 Oct 2012 17:38:08 -0400
+
+maas (0.1+bzr1264+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+
+  [ Raphaël Badin ]
+  * debian/maas-region-controller.postinst: Enable proxy_http module.
+  * debian/maas-cluster-controller.postinst: Create /var/lib/maas. (LP: #1065062)
+
+  [ Andres Rodriguez ]
+  * Install maas-provision with python-maas-provisioningserver (LP: #1065171):
+    - debian/python-maas-provisioningserver.install: Install
+    - debian/control: Add Conflicts/Replaces with maas-cluster-controller
+      to handle upgrades.
+  * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream.
+  * debian/control: Depends on maas-region-controller for maas-dns.
+  * debian/maas-region-controller.postinst: Set the correct host for
+    BROKER_URL (LP: #1065080)
+  * Handle creation of user/group in maas-common.
+  * debian/maas-region-controller.config: Always source dbconfig scripts.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 10 Oct 2012 11:17:21 -0400
+
+maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low
+
+  * 04-fix-ipmi-enlistment.patch: retry maas-enlist without power parameters
+    on failure. This allows enlistment to continue working with Precise
+    ephemeral images before the Precise SRU for maas-enlist lands.
+    (LP: #1064922).
+
+ -- Robie Basak <[e-mail]>  Wed, 10 Oct 2012 13:29:16 +0000
+
+maas (0.1+bzr1243+dfsg-0ubuntu2) quantal; urgency=low
+
+  * debian/patches/99-ipmi-user-too-long.patch: Fix username too long for
+    IPMI user created on enlistment (LP: #1064832)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 10 Oct 2012 01:00:29 -0400
+
+maas (0.1+bzr1243+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New upstream release. (LP: #1064596)
+  * debian/patches/99-temporary-fix-constraints.patch: Dropped.
+  * debian/control:
+    - ${python:Depends} for maas-common.
+    - Add missing Depends for python-maas-provisioningserver (LP: #1064542)
+  * debian/maas-cluster-controller.postinst: Create /var/log/maas if it
+    doesn't exist (LP: #1064539)
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 08 Oct 2012 17:02:56 -0400
+
+maas (0.1+bzr1223+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New upstream release. (LP: #1062518)
+
+  [ Julian Edwards ]
+  * Split packaging of 'maas' into maas-{region,cluster}-controller
+    - debian/control: Update accordingly.
+    - debian/*.install: Move files accordingly
+    - debian/*.{postinst,postrm,preinst}: Move files accordingly.
+  * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
+  * Ensure maas-dns creates the maas user before trying to chown files.
+  * Make maas-cluster-controller autoconfigure itself when upgrading from the
+    old maas package. (LP: #1059416)
+  * Add missing prerm file for maas-cluster-controller so that .pyc files
+    are cleaned up. (LP: #1059973)
+
+  [ Raphaël Badin ]
+  * Install maas_local_celeryconfig.py in /etc/maas and symlink to
+    /usr/share/maas.
+  * debian/maas.postinst: Create rabbitmq celery user/vhost.
+  * debian/maas.postinst: Update BROKER_URL in maas_local_celeryconfig.py.
+  * Use maas_local_celeryconfig_cluster.py as the local celery
+    configuration file for the cluster worker.
+  * debian/maas-region-controller.maas-region-celery.upstart: Add region
+    worker upstart script.
+  * Rename cluster worker upstart script into
+    maas-cluster-controller.maas-clluster-celery.upstart.
+  * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster"
+    as the Celery config module.
+  * debian/maas-common.install: Install celeryconfig_common.py.
+  * debian/maas-cluster-controller.install: Install celeryconfig_cluster.py.
+  * debian/maas-region-controller.install: Install celeryconfig.py.
+  * Split celery config into cluster and region configs.
+  * Add region celeryd upstart config.
+  * Define CELERY_CONFIG_MODULE in
+    maas-cluster-controller.maas-cluster-celery.upstart
+
+  [ Jeroen Vermeulen ]
+  * Make maas_local_celery_config.py non-world readable.
+  * Make maas_local_celeryconfig_cluster.py non-world readable.
+  * Set root:maas ownership of local cluster config only *after*
+    the maas user/group have been created
+
+  [ Andres Rodriguez ]
+  * debian/maas.postinst:
+    - Always restart apache2.
+    - Handle upgrades for new upstream release.
+    - Handle upgrades for celery rabbitmq worker.
+  * Add binary package to install client tool.
+    - debian/extras/maas-cli: Add binary.
+    - debian/maas-cli.install: Add. Install maascli and apiclient.
+    - debian/control: Add binary package.
+  * debian/control:
+    - Depends on freeipmi-tools instead of ipmitool.
+    - Conflicts/Replaces on maas for python-maas-client.
+    - Depends on python-netifaces, python-lxml.
+  * Add python-maas-client binary package:
+    - debian/python-maas-client.install: Add. Install 'apiclient' python module.
+    - debian/control: Add package. python-django-maas and maas-cli now
+      Depend on it.
+  * debian/rules: Install maas-dhcp-server upstart job.
+  * debian/maas.postrm: Remove celery worker rabbitmq user and host.
+  * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
+    instead of isc-dhcp-server (LP: #1055951)
+  * debian/maas-region-controller.postinst: Cleanup upgrade rules.
+  * debian/maas-cluster-controller.postinst: Fix 'local' usage.
+  * debian/maas-common.install: Install celeryconfig in appropriate location.
+  * debian/maas-cluster-controller.postrm: Add and delete maas user.
+  * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
+  * debian/maas-region-controller.postinst:
+    - Always update passwords on upgrade. No longer check versioning. (LP: #1060094).
+    - Add MAAS server to allowed mirror in squid-deb-proxy
+    - Source dbconfig conf file for maas-region-controller on upgrade because
+      it writes a new config file and no longer preservers the previous password.
+  * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
+  * debian/maas-region-controller.install: Install maas-import-squashfs
+  * Handle removal of non existant files (LP: #1059556):
+    - debian/maintscript: Added to handle removal of conffiles.
+    - debian/control: Add Pre-depends and bump debhelper version.
+  * update po files for the templates.
+  * debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the
+    appropriate etc dir.
+  * debian/maas-cluster-controller.config: Source debconf at the beginning of the
+    script. (LP: #1063857)
+  * debian/patches/99-temporary-fix-constraints.patch: Fix constraints maaping
+    when deploying with juju. Temporary until it gets merged upstream
+
+  [ Robie Basak ]
+  * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen
+    by postinst.
+
+  [ Scott Moser ]
+  * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into
+    /etc/apparmor.d/dhcpd.d (LP: #1049177), and update apparmor profile for
+    /usr/sbin/dhcpd on install/remove
+  * get the ip address for the dhcp server in config
+
+  [ Diogo Matsubara ]
+  * Add initial tests to be run by autotests:
+    - debian/control: XS-Testsuite: autopkgtest
+    - debian/tests/control: Add
+    - debian/tests/maas-package-test: Add
+    - tests/maas-integration.py: Add
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 08 Oct 2012 13:10:23 -0400
+
+maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low
+
+  * debian/extras/99-maas-sudoers: Add missing rule for
+    maas-provision. (LP: #1046397)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 05 Sep 2012 12:36:58 -0400
+
+maas (0.1+bzr971+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New upstream release (LP: #1044367)
+
+  [ Julian Edwards ]
+  * Fix 02-pserv-config.patch to handle new default tftp directory
+
+  [ Andres Rodriguez ]
+  * debian/maas.postinst:
+    - include '/MAAS' for DEFAULT_MAAS_URL.(LP: #1033956)
+    - Update bzr version to safely upgrade.
+  * Add maas-dns package that configures DNS in MAAS (LP: #1030860)
+  * Remove cobbler related bits
+    - debian/maas.postinst: Drop cobbler configuration
+    - debian/maas.install: Drop installation of snippets/preseeds.
+    - debian/control:
+      + Drop Depends on maas-provision. (LP: #975473)
+      + Depends on bind9utils.
+      + Depends on python-lockfile (LP: #1037400)
+      Add necessary Conflicts/Replaces. Add conflicts to tftpd-hpa and dnsmasq.
+      Depends on isc-dhcp-server for maas-dhcp, and syslinux-common.
+    - debian/extras/maas-provision: Add missing "$@" (LP: #1040462)
+    - debian/patches:
+      + 02-pserv-config.patch: Updated. Do not patch cobbler related bits.
+        patch tftp config to default.
+  * maas-dhcp: Re-add to handle initial configuration of MAAS DHCP server.
+  * Allow restart of 'isc-dhcp-server' by adding a sudoers file:
+    - debian/extras/99-maas-sudoers: Added.
+    - debian/maas.install: Install 99-maas-sudoers
+  * Minor improvements on dbconfig-common handling:
+    - debian/maas.config: Only call dbc_go when scripts present.
+    - debian/maas.postrm: Only call dbc_go when config file exists.
+  * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file.
+  * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868)
+  * debian/maas-dhcp.config:
+    - Ask whether we want to enable DHCP (LP: #1044229)
+    - Add debconf question for network interfaces
+  * debian/maas.prerm: Stop services before removing database (LP: #1044559)
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 02 Aug 2012 09:01:43 -0400
+
+maas (0.1+bzr777+dfsg-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream release
+  * Only run 'maas' command as root. (LP: #974046)
+    - debian/extras/maas: Check id.
+    - debian/maas.install: Install in 'sbin'.
+  * debian/maas.postinst:
+    - restart apache2 after everything gets processed.
+    - Update version to handle upgrades.
+  * debian/extras/maas-provision: Add wrapper to access 'maasprovisiong'
+    command line.
+  * debian/patches/99_temporary_fix_path.patch: Dropped. No longer needed.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 17 Jul 2012 08:28:36 -0400
+
+maas (0.1+bzr745+dfsg-0ubuntu2) quantal; urgency=low
+
+  * debian/control: Build-Dep on python-django instead of
+    python-django-configglue
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 17 Jul 2012 08:24:25 -0400
+
+maas (0.1+bzr745+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New Upstream Release
+  * debian/patches:
+    - 99_power_fixes.patch: Dropped. Merged Upstream.
+    - 99_enums_js.patch: Dropped. No longer needed.
+  * Automatically build enums.js:
+    - debian/control: Build-Depends on python-django-configglue
+    - debian/rules: Build and install enums.js.
+  * debian/maas.postinst: Update version to handle upgrades
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 12 Jul 2012 16:34:11 -0400
+
+maas (0.1+bzr740+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New upstream release
+  * debian/control: Depends on python-txtftp.
+  * debian/rules: Do not ship python-tx-tftp.
+  * debian/maas.postinst: Update version to upgrade successfully.
+  * debian/patches:
+    - 02-pserv-config.patch: Refreshed.
+    - 99_enums_js.patch: Updated.
+    - 99_power_fixes.patch: Added temporarily to enable IPMI
+    - 99_temporary_fix_path.patch: Added temporarily to not fail when
+      importing celeryconfig
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 03 Jul 2012 17:54:49 -0400
+
+maas (0.1+bzr709+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New Upstream release
+  * debian/control:
+    - Depends on python-celery, python-tempita, libjs-yui3-{full,min},
+      libjs-raphael
+  * debian/maas.install:
+    - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2.
+    - Update to install various files from chroot, rather tha manually copy
+      them from the source.
+  * debian/maas.links: symlink celeryconfig.py
+  * debian/maas.maas-celery.upstart: Add job.
+  * debian/rules:
+    - Install celery upstart job.
+    - Do not install jslibs as packages are now used.
+    - Drop copying of maas_local_settings_sample.py as source now ships
+      a maas_local_settings.py
+  * debian/patches:
+    - 04-maas-http-fix.patch: Drop. Merged upstream.
+    - 01-fix-database-settings.patch: Refreshed.
+    - 99_enums_js.patch: Added until creation of enum.js / build process
+      is fixed.
+  * debian/maas.postinst: Update bzr version to correctly handle upgrades.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 03 Jul 2012 17:42:37 -0400
+
+maas (0.1+bzr482+dfsg-0ubuntu1) precise; urgency=low
+
+  * New upstream release (Fixes LP: #981103)
+  * debian/maas.postinst:
+    - Make sure rabbitmq and postgresql are started on upgrade (LP: #981282)
+    - Handle upgrades from any lower than 0.1+bzr462+dfsg-0ubuntu1 to
+      correctly re-generate passwords, and not have db sync/migrate issues
+      as config has changed upstream.
+    - Correctly set Passwords for PSERV, otherwise it won't set new passwords.
+  * Allow MAAS_DEFAULT_URL reconfiguration. (LP: #980970)
+    - debian/maas.config: Add reconfigure validation to correctly allow it,
+      and ask a question.
+    - debian/maas.postinst: Reconfigure DEFAULT_MAAS_URL as well as cobbler
+      server and next_server for PXE/Provisioning.
+    - debian/maas.templates: Add debconf question and update info.
+  * Do not lose MAAS_DEFAULT_URL settings on upgrade (LP: #984309)
+  * debian/maas.postinst:
+    - Set cobbler password in between quotes (LP: #984427)
+    - Do not change permissions to maas.log (LP: #980915)
+  * no longer use maas-cloudimg2ephemeral, but rather use premade images
+    at http://maas.ubuntu.com
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 17 Apr 2012 23:44:46 -0700
+
+maas (0.1+bzr462+dfsg-0ubuntu1) precise; urgency=low
+
+  * New upstream release (LP: #980240)
+
+  [ Scott Moser ]
+  * add dependency on distro-info (LP: #949442)
+  * debian/control: add dependency on tgt for ephemeral iscsi environment
+
+  [ Andres Rodriguez ]
+  * Make package lintian clean:
+    - maas{-dhcp}.lintian-overrides: Add to make lintian clean.
+    - debian/control: Add missing dependencies; correct section and desc.
+    - debian/maas.postinst: Do not use absolute path for rabbitmqctl.
+    - debian/patches: Add headers to all patches.
+  * debian/maas-dhcp.postrm: Added to disable dnsmasq in cobbler on removal.
+  * debian/maas.config: Do not set a password with pwgen as it is not an
+    essential package; allow dbconfig-common to create a password instead by
+    creating an empty question. (LP: #977475)
+  * Run MAAS, pserv, txlongpoll as non-root user. (LP: #975436)
+    - debian/maas.postinst: Create user/group; set correct permissions for
+      directories.
+    - debian/maas.postrm: Remove user/group; restart apache2.
+    - debian/maas.maas-{pserv,txlongpoll}.upstart: Update to run as non-root
+      'maas' user.
+  * debian/patches/01-fix-database-settings.patch: Remove adding of PSERV_URL.
+  * debian/maas.postinst:
+    - Handle config file upgrade from versions lower than 0.1+bzr445+dfsg-0ubuntu1,
+      by creating new passwords and updating accordingly
+    - use local variables in functions.
+    - Handle maas tgt configuration for upgrades from 0.1+bzr459+dfsg-0ubuntu1.
+  * debian/extras/99-maas: Add squid-deb-proxy file to enable PPAs. (LP: #979383)
+  * debian/maas.install: Install missing commissioning-user-data script.
+
+  [ Dave Walker (Daviey) ]
+  * debian/patches/02-pserv-config.patch: Refreshed to apply to updated config.
+
+  [ Gavin Panella ]
+  * debian/maas.postinst: Update pserv.yaml and maas_local_settings.py to use
+    password.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 12 Apr 2012 16:37:53 -0400
+
+maas (0.1+bzr415+dfsg-0ubuntu2) precise; urgency=low
+
+  * debian/maas-dhcp.{config,postinst}:
+    - Fix not setting new values on fresh install. (LP: #975321)
+    - Fix unsetting domain, otherwise, even if disabled, it will always be set.
+  * debian/control: Depends on maas for maas-dhcp.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 06 Apr 2012 15:30:44 -0400
+
+maas (0.1+bzr415+dfsg-0ubuntu1) precise; urgency=low
+
+  * debian/control: Update package descriptions; Suggests maas-dhcp for maas
+    and add a maas-dhcp binary.
+  * Add maas-dhcp package to configure a DHCP server.
+    - debian/maas-dhcp.config: Add to ask debconf questions about range,
+      gateway, and domain.
+    - debian/maas-dhcp.postinst: Handle update of config values.
+    - debian/maas-dhcp.templates: Debconf questions.
+  * debian/po: Update for templates.
+  * Add message telling MAAS URL after installation.
+    - debian/maas.templates: Add message.
+    - debian/maas.postinst: Display message.
+  * debian/maas.config: Hide dbconfig-install question.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 04 Apr 2012 14:47:13 -0400
+
+maas (0.1+bzr400+dfsg-0ubuntu1) precise; urgency=low
+
+  * debian/patches/{02-pserv-config,03-txlongpoll-config}.patch: Refreshed.
+  * debian/maas.install: Install maas-gc cronjob.
+  * Add apport hook.
+    - debian/maas.apport: Add hook.
+    - debian/rules: Install with apport.
+  * debian/maas.logrotate: Add logrotate for txlongpoll and pserv logs.
+  * Create 'var/lib/media/maas/storage' on postinst to have right permissions.
+    - debian/maas.dirs: Drop dir creation.
+    - debian/maas.postinst: Create dir with correct permissions.
+    - debian/maas.postrm: Remove dir on purge.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 03 Apr 2012 14:50:34 -0400
+
+maas (0.1+bzr378+dfsg-0ubuntu1) precise; urgency=low
+
+  * maas.dirs: Create var/lib/maas/media/storage for juju storage.
+  * maas.postinst:
+    - Give correct permissions to above dir.
+    - stop apache2 before db upgrade, and restart after.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 29 Mar 2012 19:28:13 -0400
+
+maas (0.1+bzr363+dfsg-0ubuntu1) precise; urgency=low
+
+  [ Dave Walker (Daviey) ]
+  * debian/control: Add openssh-server as a Recommends, and wrap-and-sort.
+
+  [ Andres Rodriguez ]
+  * debian/maas.postinst:
+    - Do not start apache with apache2ctl. Use invoke-rc.d instead to not
+      fail in the installer.
+    - For start of postgresql before creating the DB, otherwise it will
+      fail in the installer.
+    - Add check of invoke-rc.d for syslog.
+    - Add check of invoke-rc.d for rabbitmq-server; Add check for rabbitmqctl
+    - Add db_stop, in case invoke-rc.d fails.
+  * debian/control: Tight python-django-maas dependency.
+  * debian/postrm: Add check for rabbitmqctl.
+  * debian/maas.maas-txlongpoll.upstart: Create rabbitmq longpoll user/vhost
+    and set permissions if they don't exist. Start on rabbitmq-server-running.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 27 Mar 2012 14:49:56 -0400
+
+maas (0.1+bzr338+dfsg-0ubuntu1) precise; urgency=low
+
+  [ Dave Walker (Daviey) ]
+  * d/patches/03-txlongpoll-config.patch: Resolve typo error from prior patch.
+    - LP: #961031
+
+  [ Andres Rodriguez ]
+  * debian/maas.config: Don't allow reconfigure.
+  * debian/maas.postinst: Don't allow reconfigure. Run sync/migrate db on
+    all upgrades.
+
+  [ Scott Moser ]
+  * add rsylog config for logging node boots (LP: 960149)
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 22 Mar 2012 10:56:58 -0400
+
+maas (0.1+bzr315+dfsg-0ubuntu1) precise; urgency=low
+
+  * New upstream snapshot.
+
+  [ Dave Walker ]
+  * debian/maas.postinst: Do not import ISO's at install time.
+  * debian/control:
+    - Drop run-one, it's not a requirement and currently in universe.
+    - Drop python-setproctitle, no longer required.
+
+  [ Andres Rodriguez ]
+  * debian/control: Depends on python-avahi, python-dbus, and avahi-daemon.
+  * debian/maas.postinst:
+    - Only syncdb if dbconfig db creation was selected.
+    - Set rabbitmq/longpoll settings
+  * debian/patches/03-txlongpoll-config.patch: Updated broker settings for
+    rabbitmq.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 20 Mar 2012 20:10:58 -0400
+
+maas (0.1+bzr300+dfsg-0ubuntu1) precise; urgency=low
+
+  * debian/patches:
+    - 01-fix-database-settings.patch: Update PSERV_URL port.
+    - 02-pserv-config.patch: Update, and set 'maas' as username.
+    - 03-longpoll-config.patch: Update.
+  * debian/maas.install: Install preseeds and snippets.
+  * debian/maas.postinst:
+    - Set password for 'maas' cobbler username (in pserv and cobbler).
+    - Set DEFAULT_MAAS_URL to IP of interface with default gateway.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 16 Mar 2012 14:59:16 -0400
+
+maas (0.1+bzr295+dfsg-0ubuntu2) precise; urgency=low
+
+  * debian/patches:
+    - 01-fix-database-settings.patch: Update to set PSERV_URL.
+    - 02-pserv-config.patch: Set port to 8001.
+  * debian/maas.postinst: Run maas-import-isos on install.
+  * debian/control: Depends on rabbitmq-server.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 15 Mar 2012 18:14:08 -0400
+
+maas (0.1+bzr295+dfsg-0ubuntu1) precise; urgency=low
+
+  * debian/maas.upstart: Specify pidfile and conffile.
+  * debian/maas.postinst:
+    - Only run syncdb if dbconfig postinst file exists.
+    - Fix file permissions.
+  * debian/maas.{postrm,prerm}: Add dbconfig-common support.
+  * Add txlongpoll support for packaging:
+    - debian/control: Depends on python-txlongpoll.
+    - debian/maas.maas-longpoll.upstart: Added to start txlongpoll.
+    - debian/maas.install: Install txlongpoll.yaml
+  * debian/extras/maas: Improvements.
+  * debian/maas.maas.upstart: Moved from debian/maas.upstart.
+  * debian/maas.postinst: Touch logfile to set correct permissions (LP: #955400)
+  * debian/maas.logrotate: Add.
+  * debian/patches/03-txlongpoll-config.patch: Add default settings.
+  * debian/maas.config: Only run dbconfig-common on configure/reconfigure.
+  * Install maas_local_settings.py in /etc/maas and symlink to usr/share/maas
+  * Update references from MaaS to MAAS.
+  * Remove podebconf as templates no longer exist.
+    - debian/po: Remove.
+    - debian/control: Drop Build-Depends on po-debconf
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 15 Mar 2012 15:28:14 -0400
+
+maas (0.1+bzr266+dfsg-0ubuntu1) precise; urgency=low
+
+  * Remove support for squid3 and use squid-deb-proxy instead.
+  * debian/extras/maas: Add to handle syncdb and creation of admin user.
+  * Add debconf questions to ask for user/pass:
+    - debian/maas.{template,config}: Add
+    - debian/maas.postinst: Ask debconf questions.
+    - debian/po: Add translation templates.i
+  * debian/maas.postinst: Enable wsgi module; drop squid3 steps.
+  * debian/maas.postrm: removed.
+  * debian/patches/01-fix-database-settings.patch: Custom database settings
+    and static files path.
+  * debian/{rules,maas.install}: Install maas static files in
+    'usr/share/maas/web/static'.
+  * Integrate cobbler:
+    - debian/maas.install: Install pserv twisted plugin, and config.
+    - debian/maas.upstart: Created to start plugin daemon.
+    - debian/patches/02-pserv-config.patch: Custom pserv config.
+  * Integrate dbconfig-common:
+    - debian/maas.config: Added and default user/pass and database.
+    - debian/maas.{postinst,postrm}: Added handling for dbconfig-common
+  * debian/control: Depends on python-convoy.
+  * debian/rules: Update path to removal of dsfg files.
+  * debian/patches/01-fix-database-settings.patch: Updated.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 13 Mar 2012 14:31:50 -0400
+
+maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low
+
+  * New upstream snapshot.
+
+  [ Dave Walker ]
+  * debian/control:
+    - Changed depends from psycopg2 to python-psycopg2 and dropped versioning.
+      - LP: #937982
+
+  [ Andres Rodriguez ]
+  * debian/maas.install: Install maas-import-isos and related files.
+  * Integrate squid3 as proxy solution:
+    - debian/extras/squid.conf: Added
+    - debian/control: Depend on squid3.
+    - debian/maas.{postinst,postrm}: Handle installation/removal of custom
+      squid config file.
+  * Split into different binary packages (maas,python-django-maas).
+    - debian/maas.postinst: Handle the apache2 configuration.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 07 Mar 2012 12:46:17 -0500
+
+maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low
+
+  * New upstream snapshot, post 0.1 release.
+  * debian/control:
+    - Drop depends on rabbitmq-server, no longer required.
+  * debian/watch: Introduced watch file.
+
+ -- Dave Walker (Daviey) <[e-mail]>  Thu, 23 Feb 2012 13:08:12 +0000
+
+maas (0.1~bzr146+dfsg-0ubuntu1) precise; urgency=low
+
+  * Initial release
+
+ -- Julian Edwards <[e-mail]>  Thu, 16 Jan 2012 15:29:07 +0000
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+7
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2015-06-03 20:01:10 +0000
@@ -0,0 +1,233 @@
+Source: maas
+Section: net
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 8.1.0~),
+               dh-apport,
+               dh-systemd,
+               po-debconf,
+               python (>= 2.7),
+               python-distribute,
+               python-django
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+Homepage: https://launchpad.net/maas
+
+Package: maas
+Architecture: all
+Depends: ${misc:Depends},
+ maas-cluster-controller (= ${binary:Version}),
+ maas-region-controller (= ${binary:Version}),
+ python-django-maas (= ${binary:Version})
+Description: MAAS server all-in-one metapackage
+ MAAS is "Metal As A Service", a system for dynamic provisioning of physical
+ servers that has many of the same characteristics as a cloud.  You register
+ servers with MAAS by telling MAAS about their IPMI or other control system.
+ MAAS can then do hardware inventory, and provision that system on demand
+ with whatever OS and software you like.  MAAS is standalone software that
+ works with any configuration system, but for best results combine MAAS with
+ Juju.
+ .
+ MAAS provides:
+  * Hardware inventory of servers
+  * Dynamic provisioning based on name or attributes such as disk, RAM cores, sockets
+  * DNS and DHCP as needed
+  * PXE boot services
+ .
+ This package is a metapackage which installs all of the separate components
+ of MAAS on a single machine.
+
+Package: maas-common
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Description: MAAS server common files
+ This package contains the common files for any MAAS installation.
+
+Package: maas-region-controller-min
+Architecture: all
+Depends: apache2,
+         bind9utils,
+         dbconfig-common,
+         iproute,
+         libjs-angularjs,
+         libjs-yui3-full,
+         libjs-yui3-min,
+         maas-common (= ${binary:Version}),
+         maas-proxy (= ${binary:Version}),
+         python-bson,
+         python-django16 | python-django (<< 1.7),
+         python-django,
+         python-django-maas (= ${binary:Version}),
+         python-django-piston,
+         python-django-south,
+         python-maas-provisioningserver (= ${binary:Version}),
+         python-djorm-ext-pgarray,
+         rsyslog,
+         ubuntu-cloudimage-keyring,
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
+Replaces: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
+Description: MAAS Server minimum region controller
+ This package installs and configures the minimum region controller
+ services provided by MAAS, including the web UI, caching package proxy,
+ networking/traffic control, and remote logging system.
+
+Package: maas-region-controller
+Architecture: all
+Depends: maas-region-controller-min (= ${binary:Version}),
+         postgresql (>= 9.1),
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: openssh-server, maas-dns (= ${binary:Version})
+Description: MAAS server complete region controller
+ This package installs and configures the complete MAAS region controller,
+ including the minimum setup, plus the database server and messaging queue.
+
+Package: python-maas-provisioningserver
+Section: python
+Architecture: all
+Depends: python-bson,
+         python-crochet,
+         python-distro-info,
+         python-formencode,
+         python-jsonschema,
+         python-lockfile,
+         python-lxml,
+         python-maas-client (= ${binary:Version}),
+         python-netifaces,
+         python-paramiko,
+         python-pexpect,
+         python-pyparsing,
+         python-seamicroclient,
+         python-simplestreams,
+         python-tempita,
+         python-twisted-core,
+         python-twisted-web,
+         python-txamqp,
+         python-txtftp,
+         python-yaml,
+         python-zope.interface,
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
+Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
+Description: MAAS server provisioning libraries
+ This package provides the MAAS provisioning server python libraries.
+
+Package: maas-cli
+Architecture: all
+Depends: python-bzrlib,
+         python-httplib2,
+         python-maas-client (= ${binary:Version}),
+         python-oauth,
+         ${misc:Depends},
+         ${python:Depends}
+Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
+Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
+Description: MAAS command line API tool
+ This package contains the MAAS client command line API tool.
+ This tool enables automation of tasks in MAAS, remotely, through
+ its API.
+
+Package: python-maas-client
+Section: python
+Architecture: all
+Depends: python-oauth, ${misc:Depends}, ${python:Depends}
+Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
+Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
+Description: MAAS python API client
+ This package contains the MAAS client API Python modules.
+
+Package: maas-cluster-controller
+Architecture: all
+Depends: authbind,
+         bind9utils,
+         distro-info,
+         freeipmi-tools,
+         grub-common,
+         maas-cli (=${binary:Version}),
+         maas-common (=${binary:Version}),
+         maas-dhcp (=${binary:Version}),
+         python-httplib2,
+         python-lockfile,
+         python-maas-provisioningserver (=${binary:Version}),
+         python-netaddr,
+         python-oauth,
+         python-tempita,
+         python-twisted,
+         python-zope.interface,
+         rsyslog,
+         pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5),
+         syslinux-common,
+         tgt,
+         uuid-runtime,
+         wget,
+         ${misc:Depends},
+         ${python:Depends}
+Suggests: ipmitool, libvirt-bin, amtterm, python-pyvmomi
+Conflicts: tftpd-hpa
+Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
+Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
+Description: MAAS server cluster controller
+ This package contains the MAAS cluster controller, which is responsible
+ for enabling and controlling remote DHCP/TFTP instances on their own
+ subnets.
+
+Package: python-django-maas
+Section: python
+Architecture: all
+Depends: python-amqp,
+         python-apt,
+         python-convoy,
+         python-crochet,
+         python-curtin,
+         python-lockfile,
+         python-lxml,
+         python-maas-client (= ${binary:Version}),
+         python-netaddr,
+         python-psycopg2,
+         python-sphinx,
+         python-tempita,
+         python-twisted,
+         python-txamqp,
+         python-zope.interface,
+         ${misc:Depends},
+         ${python:Depends}
+Description: MAAS server Django web framework
+ This package provides the Django web framework for MAAS.
+
+Package: maas-dhcp
+Architecture: all
+Depends: isc-dhcp-server (>= 4.2.4), ${misc:Depends}
+Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Description: MAAS DHCP server
+ This package installs and configures a DHCP server that can be used by
+ MAAS, and enhances the overall MAAS user experience.
+
+Package: maas-dns
+Architecture: all
+Depends: bind9,
+ maas-region-controller-min (= ${binary:Version}),
+ python-iscpy,
+ ${misc:Depends}
+Conflicts: dnsmasq
+Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Description: MAAS DNS server
+ This package installs and configures a DNS server that can be used by
+ MAAS, and enhances the overall MAAS user experience.
+
+Package: maas-proxy
+Architecture: all
+Depends: ${python:Depends},
+         ${misc:Depends},
+         squid3
+Conflicts: squid-deb-proxy
+Replaces: squid-deb-proxy
+Description: MAAS Caching Proxy
+ This package installs and configures a Caching Proxy server that can be
+ used by MAAS. It enhances the overall MAAS user experience.
 
=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2015-06-03 20:01:10 +0000
@@ -0,0 +1,45 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: maas
+Source: https://launchpad.net/maas
+
+Files: *
+Copyright: 2012 Canonical Ltd.
+License: AGPL-3.0+
+
+Files: debian/*
+Copyright: 2012 Canonical Ltd.
+License: AGPL-3.0+
+
+License: AGPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+ .
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Files: src/maasserver/static/js/angular/3rdparty/ng-tags-input.js
+Copyright: Copyright (c) 2013-2015 Michael Benford.
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ the Software, and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
=== added directory 'debian/extras'
=== added file 'debian/extras/20-maas.conf'
--- debian/extras/20-maas.conf	1970-01-01 00:00:00 +0000
+++ debian/extras/20-maas.conf	2015-06-03 20:01:10 +0000
@@ -0,0 +1,32 @@
+# Enable the udp server for installation logging
+$ModLoad imudp
+$UDPServerRun 514
+$ModLoad imtcp # load TCP listener
+
+# The following section (certificates) was copied from orchestra, but is
+# not used here.  In the future, if we needed secure ssl, then re-enable.
+# These files were created in the orchestra-logging-server's postinst
+#
+## make gtls driver the default
+#$DefaultNetstreamDriver gtls
+#
+## certificate files
+#$DefaultNetstreamDriverCAFile /var/lib/maas/ssl-cert-orchestra-ca.pem
+#$DefaultNetstreamDriverCertFile /var/lib/maas/.ssl/ssl-cert-orchestra.pem
+#$DefaultNetstreamDriverKeyFile /var/lib/maas/.ssl/ssl-cert-orchestra-pk.pem
+#
+#$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode
+#$InputTCPServerStreamDriverAuthMode anon # client is NOT authenticated
+#$InputTCPServerRun 10514 # start up listener at port 10514
+
+# Reduce message repetition
+$RepeatedMsgReduction on
+##$RepeatedMsgContainsOrigionalMsg on
+
+# Message templating
+$template MAASboot,"/var/log/maas/rsyslog/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/messages"
+
+:fromhost-ip, !isequal, "127.0.0.1" ?MAASboot
+# Stop messages that came from anywhere else from going into other places
+# like /var/log/syslog. If you want to see these messages there, then comment below
+& ~
 
=== added file 'debian/extras/99-maas'
--- debian/extras/99-maas	1970-01-01 00:00:00 +0000
+++ debian/extras/99-maas	2015-06-03 20:01:10 +0000
@@ -0,0 +1,5 @@
+# /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+#
+# Enable launchpad personal package archives for squid-deb-proxy
+ppa.launchpad.net
+keyserver.ubuntu.com
 
=== added file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers	1970-01-01 00:00:00 +0000
+++ debian/extras/99-maas-sudoers	2015-06-03 20:01:10 +0000
@@ -0,0 +1,12 @@
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd start
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd status
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd restart
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd stop
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 start
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 status
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 restart
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 stop
+maas ALL= NOPASSWD: /usr/sbin/service tgt status
+maas ALL= NOPASSWD: /usr/sbin/service tgt start
+maas ALL= NOPASSWD: /usr/sbin/maas-provision
+maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
 
=== added file 'debian/extras/isc-dhcp-server.override'
--- debian/extras/isc-dhcp-server.override	1970-01-01 00:00:00 +0000
+++ debian/extras/isc-dhcp-server.override	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+manual
 
=== added file 'debian/extras/maas'
--- debian/extras/maas	1970-01-01 00:00:00 +0000
+++ debian/extras/maas	2015-06-03 20:01:10 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "`expr \"$0\" : \".*maas-cli*\"`" != "0" ];then
+    echo "  WARNING: The maas-cli command is deprecated and will be removed" \
+         "in a future\n  version.  From now on please use 'maas' instead." >&2
+fi
+exec python -m maascli "$@"
 
=== added file 'debian/extras/maas-probe-dhcp'
--- debian/extras/maas-probe-dhcp	1970-01-01 00:00:00 +0000
+++ debian/extras/maas-probe-dhcp	2015-06-03 20:01:10 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ "$(id -u)" != "0" ]; then
+	echo "This utility may only be run as root." 1>&2
+	exit 1
+fi
+export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
+exec /usr/bin/python -m provisioningserver.dhcp.probe "$@"
 
=== added file 'debian/extras/maas-provision'
--- debian/extras/maas-provision	1970-01-01 00:00:00 +0000
+++ debian/extras/maas-provision	2015-06-03 20:01:10 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ "$(id -u)" != "0" ]; then
+	echo "This utility may only be run as root." 1>&2
+	exit 1
+fi
+export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
+exec /usr/bin/python -m provisioningserver "$@"
 
=== added file 'debian/extras/maas-proxy-common.sh'
--- debian/extras/maas-proxy-common.sh	1970-01-01 00:00:00 +0000
+++ debian/extras/maas-proxy-common.sh	2015-06-03 20:01:10 +0000
@@ -0,0 +1,34 @@
+pre_start() {
+  if [ -x /usr/sbin/squid ]; then
+      SQUID=/usr/sbin/squid
+  elif  [ -x /usr/sbin/squid3 ]; then
+      SQUID=/usr/sbin/squid3
+  else
+      echo "No squid binary found"
+      exit 1
+  fi
+
+  # ensure all cache dirs are there
+  install -d -o proxy -g proxy -m 750 /var/cache/maas-proxy/
+  install -d -o proxy -g proxy -m 750 /var/log/maas/proxy/
+  install -m 750 -o proxy -g proxy -d /var/spool/maas-proxy/
+  if [ -d /var/log/maas/proxy ]; then
+   chown -R proxy:proxy /var/log/maas/proxy
+  fi
+  if [ ! -d /var/cache/maas-proxy/00 ]; then
+   $SQUID -z -N -f /etc/maas/maas-proxy.conf
+  fi
+}
+
+# from the squid3 debian init script
+find_cache_dir () {
+        w="     " # space tab
+        res=`sed -ne '
+                s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+                t end;
+                d;
+                :end q' < $CONFIG`
+        [ -n "$res" ] || res=$2
+        echo "$res"
+}
+
 
=== added file 'debian/extras/maas-proxy.conf'
--- debian/extras/maas-proxy.conf	1970-01-01 00:00:00 +0000
+++ debian/extras/maas-proxy.conf	2015-06-03 20:01:10 +0000
@@ -0,0 +1,37 @@
+# Inspired by UDS's conference proxy
+
+acl maas_proxy_manager proto cache_object
+acl localhost src 127.0.0.1/32 ::1
+acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
+acl localnet src all # TODO: We should auto-generate this with the networks MAAS manages/knows about.
+acl SSL_ports port 443
+acl Safe_ports port 80		# http
+acl Safe_ports port 21		# ftp
+acl Safe_ports port 443		# https
+acl Safe_ports port 1025-65535	# unregistered ports
+acl CONNECT method CONNECT
+http_access allow maas_proxy_manager localhost
+http_access deny maas_proxy_manager
+http_access deny !Safe_ports
+http_access deny CONNECT !SSL_ports
+http_access allow localnet
+http_access allow localhost
+http_access deny all
+http_port 3128 transparent
+http_port 8000
+coredump_dir /var/spool/maas-proxy
+refresh_pattern ^ftp:		1440	20%	10080
+refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
+refresh_pattern (Release|Packages(.gz)*)$      0       20%     2880
+refresh_pattern .		0	20%	4320
+forwarded_for delete
+visible_hostname maas.proxy # TODO: This should be autogenerated by a template.
+cache_mem 512 MB
+minimum_object_size 0 MB
+maximum_object_size 1024 MB
+maximum_object_size_in_memory 100 MB
+cache_dir aufs /var/spool/maas-proxy 40000 16 256
+# use different logs
+cache_access_log /var/log/maas/proxy/access.log
+cache_log /var/log/maas/proxy/cache.log
+cache_store_log /var/log/maas/proxy/store.log
 
=== added file 'debian/extras/maas-region-admin'
--- debian/extras/maas-region-admin	1970-01-01 00:00:00 +0000
+++ debian/extras/maas-region-admin	2015-06-03 20:01:10 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+import os
+import sys
+
+user_id = os.getuid()
+if user_id != 0:
+    print("This utility may only be run as root.")
+    sys.exit(1)
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings")
+sys.path.append('/usr/share/maas')
+
+# Use Django 1.6 if the python-django16 package is installed: this is
+# to get MAAS to work on vivid: vivid ships with Django 1.7 by default
+# and MAAS isn't yet compatible with Django 1.7.
+if os.path.exists('/usr/lib/django16'):
+    sys.path.insert(1, '/usr/lib/django16')
+
+from django.core import management
+
+if __name__ == "__main__":
+    management.execute_from_command_line()
 
=== added file 'debian/extras/maas_remote_syslog_compress'
--- debian/extras/maas_remote_syslog_compress	1970-01-01 00:00:00 +0000
+++ debian/extras/maas_remote_syslog_compress	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+# Compress log files not changed in more than 48 hours:
+30 4 * * * root find /var/log/maas/rsyslog -type f -mtime +2 -exec bzip2 '{}' \;
 
=== added file 'debian/extras/squid3.override'
--- debian/extras/squid3.override	1970-01-01 00:00:00 +0000
+++ debian/extras/squid3.override	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+manual
 
=== added file 'debian/maas-cli.install'
--- debian/maas-cli.install	1970-01-01 00:00:00 +0000
+++ debian/maas-cli.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+debian/extras/maas usr/bin
+debian/tmp/usr/lib/python*/dist-packages/maascli
 
=== added file 'debian/maas-cli.links'
--- debian/maas-cli.links	1970-01-01 00:00:00 +0000
+++ debian/maas-cli.links	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+usr/bin/maas usr/bin/maas-cli
 
=== added file 'debian/maas-cli.lintian-overrides'
--- debian/maas-cli.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/maas-cli.lintian-overrides	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+maas-cli: binary-without-manpage usr/bin/maas-cli
 
=== added file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.config	2015-06-03 20:01:10 +0000
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+# Only ask for new installations and reconfiguring.
+# XXX Fix to not ask when installing from the CD.
+if ([ "$1" = "configure" ] && [ -z "$2" ]); then
+
+    db_get maas-cluster-controller/maas-url || true
+    if [ -z "$RET" ]; then
+        # Attempt to pre-populate if installing on the region controller.
+        if [ -e /etc/maas/maas_local_settings.py ]; then
+            url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py)
+            # If the URL doesn't end in /MAAS then add it. This helps upgrades from
+            # precise for which the URL didn't contain /MAAS, which is now required
+            if ! echo $url | grep -qs "/MAAS$"; then
+                url="${url}/MAAS"
+            fi
+            db_set maas-cluster-controller/maas-url "$url"
+        else
+            # Will only get here if dbconf value not already set, or
+            # /etc/maas/maas_local_settings.py doesn't exist.
+            db_input medium maas-cluster-controller/maas-url || true
+            db_go
+        fi
+    fi
+fi
+
+if [ "$1" = "reconfigure" ]; then
+    db_input high maas-cluster-controller/maas-url || true
+    db_go
+fi
+#DEBHELPER#
 
=== added file 'debian/maas-cluster-controller.dirs'
--- debian/maas-cluster-controller.dirs	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.dirs	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+etc/maas
+var/lib/maas/boot-resources
 
=== added file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,21 @@
+# Install twisted plugins
+twisted/plugins/maasclusterd.py usr/share/pyshared/twisted/plugins
+
+# Install PSERV config file
+debian/tmp/etc/maas/pserv.yaml
+
+# Install cluster config file
+debian/tmp/etc/maas/maas_cluster.conf
+
+# Install templates
+debian/tmp/etc/maas/templates/dhcp
+debian/tmp/etc/maas/templates/power
+debian/tmp/etc/maas/templates/pxe
+debian/tmp/etc/maas/templates/uefi
+
+# Install uec2roottar
+debian/tmp/usr/bin/uec2roottar
+
+# Install all other stuff
+debian/extras/99-maas-sudoers etc/sudoers.d
+debian/extras/isc-dhcp-server.override etc/init
 
=== added file 'debian/maas-cluster-controller.lintian-overrides'
--- debian/maas-cluster-controller.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.lintian-overrides	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+maas-cluster-controller: binary-without-manpage usr/bin/uec2roottar
 
=== added file 'debian/maas-cluster-controller.logrotate'
--- debian/maas-cluster-controller.logrotate	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.logrotate	2015-06-03 20:01:10 +0000
@@ -0,0 +1,15 @@
+/var/log/maas/clusterd.log {
+ rotate 5
+ weekly
+ compress
+ missingok
+ # copytruncate may lose log messages at the moment of rotation, but
+ # there is no better way to integrate twistd and logrotate.
+ copytruncate
+ # The logs are all owned by the `maas` user, so drop privs.
+ su maas maas
+ # Don't rotate unless the log is at least 10MB.
+ minsize 10M
+ # Force rotation if the log grows beyond 50MB.
+ maxsize 50M
+}
 
=== added file 'debian/maas-cluster-controller.maas-clusterd.service'
--- debian/maas-cluster-controller.maas-clusterd.service	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.maas-clusterd.service	2015-06-03 20:01:10 +0000
@@ -0,0 +1,26 @@
+[Unit]
+Description=MAAS Cluster Controller
+Documentation=https://maas.ubuntu.com/
+Requires=network-online.target
+After=network-online.target
+ConditionPathExists=/var/lib/maas/secret
+# These will go away one we support new config files.
+ConditionPathExists=/etc/maas/maas_cluster.conf
+ConditionPathExists=/etc/maas/pserv.yaml
+
+[Service]
+User=maas
+Group=maas
+Restart=always
+EnvironmentFile=/etc/maas/maas_cluster.conf
+Environment="LOGFILE=/var/log/maas/clusterd.log"
+# Logs go to the journal; read them with
+#   journalctl -u maas-clusterd
+# Logs also go to $LOGFILE for backward compatibility. The journal
+# should now be preferred as the $LOGFILE will be removed in MAAS 1.9.
+ExecStart=/bin/sh -c \
+    'exec /usr/bin/authbind --deep /usr/bin/twistd --nodaemon --pidfile= \
+     maas-clusterd --config-file=/etc/maas/pserv.yaml 2>&1 | tee -a $LOGFILE'
+
+[Install]
+WantedBy=multi-user.target
 
=== added file 'debian/maas-cluster-controller.maas-clusterd.upstart'
--- debian/maas-cluster-controller.maas-clusterd.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.maas-clusterd.upstart	2015-06-03 20:01:10 +0000
@@ -0,0 +1,52 @@
+description "MAAS Cluster Controller"
+author "Andres Rodriguez <[e-mail]>"
+
+start on filesystem and net-device-up
+stop on runlevel [016]
+
+respawn
+
+env CONFIG_FILE=/etc/maas/maas_cluster.conf
+env LOGFILE=/var/log/maas/clusterd.log
+
+pre-start script
+    if [ ! -f $CONFIG_FILE ]; then
+        echo "$CONFIG_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+end script
+
+script
+    # Exit immediately on error, and treat unset variables as errors. In
+    # sh/dash, unfortunately, the following does not cause the use of an unset
+    # variable to halt the script, it merely prints an error and sets $?.
+    set -o errexit -o nounset
+    # Load the configuration file.
+    . $CONFIG_FILE
+    # The MAAS cluster controller needs both CLUSTER_UUID and MAAS_URL to
+    # operate.
+    export CLUSTER_UUID
+    export MAAS_URL
+    # Check for the shared-secret. If it's not here, sleep for a while, then
+    # exit and allow respawn to do its thing.
+    if ! maas-provision check-for-shared-secret >/dev/null; then
+        fmt -w 72 <<-'EOF' >&2
+	A shared secret has not been installed for this cluster. Obtain
+	the secret from the region (find it in /var/lib/maas/secret once
+	the region controller has started for the first time) and
+	install it with `maas-provision install-shared-secret`.
+
+	However, if this machine is also serving as the region, ensure
+	that the region controller is started (`sudo service apache2
+	start` typically). It will create the shared secret, which
+	maas-clusterd will then find when it respawns in 5 seconds.
+
+	EOF
+        exec sleep 5
+    fi
+    # To add options to your daemon, edit the line below:
+    exec /usr/bin/authbind --deep \
+        /usr/bin/twistd --nodaemon --uid=maas --gid=maas --pidfile= \
+        maas-clusterd --config-file=/etc/maas/pserv.yaml > ${LOGFILE} 2>&1
+end script
 
=== added file 'debian/maas-cluster-controller.maintscript'
--- debian/maas-cluster-controller.maintscript	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.maintscript	2015-06-03 20:01:10 +0000
@@ -0,0 +1,7 @@
+rm_conffile /etc/maas/bootresources.yaml 1.7.0~beta1+bzr2781-0ubuntu1
+rm_conffile /etc/maas/maas_local_celeryconfig_cluster.py 1.7.0~beta3+bzr3043-0ubuntu1
+rm_conffile /etc/init/maas-cluster-celery.conf 1.7.0~beta3+bzr3043-0ubuntu1
+rm_conffile /etc/init/maas-pserv.conf 1.7.0~beta3+bzr3043-0ubuntu1
+rm_conffile /etc/init/maas-cluster.conf 1.7.0~beta6+bzr3231-0ubuntu1
+rm_conffile /etc/init/maas-cluster-register.conf 1.7.0~beta6+bzr3231-0ubuntu1
+rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-0ubuntu1
 
=== added file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.postinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+RELEASE=`lsb_release -rs` || RELEASE=""
+
+create_var_dir() {
+    # create var dir
+    if [ ! -d /var/lib/maas ]; then
+        mkdir -p /var/lib/maas
+    fi
+    chown -R maas:maas /var/lib/maas/
+
+}
+create_log_dir() {
+    # Give appropriate permissions
+    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() {
+    # Ensure that iSCSI targets get re-defined on reboot.
+    # Creates a softlink in /etc/tgt/conf.d/ that points to the current
+    # boot images' tgt configuration.
+    mkdir -p /etc/tgt/conf.d
+    ln -sf /var/lib/maas/boot-resources/current/maas.tgt /etc/tgt/conf.d/maas.conf
+}
+
+extract_cluster_uuid(){
+    # Extract ClUSTER_UUID setting from config file $1.  This will work
+    # the cluster config (which is shell).
+    sed -n -e "s/^CLUSTER_UUID *= *[\"']\([^\"']*\).*/\1/p" "$1"
+}
+
+configure_cluster_uuid(){
+    # The cluster uuid goes into maas_cluster.conf.  If an old uuid is
+    # configured, we replicate that to maas_cluster.conf; otherwise,
+    # we want to generate one.
+    local uuid
+
+    if [ -n "$(extract_cluster_uuid /etc/maas/maas_cluster.conf)" ]; then
+        # UUID is already set up.  Wonderful.
+        return
+    else
+        # No UUID at all yet.  Generate one.
+        uuid="$(uuidgen)"
+    fi
+
+    # Write the uuid to maas_cluster.conf
+    # There is no initial placeholder in this file, so just append the setting.
+    echo "CLUSTER_UUID=\"$uuid\"" >>/etc/maas/maas_cluster.conf
+}
+
+enable_apache_version_mod(){
+    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+    if [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+        a2enmod version
+    fi
+}
+
+configure_cluster_authbind() {
+    MAAS_UID="`id -u maas`"
+    if [ ! -f "/etc/authbind/byuid/$MAAS_UID" ]; then
+        if [ ! -d "/etc/authbind/byuid" ]; then
+            mkdir -p /etc/authbind/byuid
+            chmod 755 /etc/authbind
+            chmod 755 /etc/authbind/byuid
+        fi
+    fi
+    echo '0.0.0.0/0:68,69' >/etc/authbind/byuid/$MAAS_UID
+    echo '::/0,68-69' >>/etc/authbind/byuid/$MAAS_UID
+    chown maas:maas /etc/authbind/byuid/$MAAS_UID
+    chmod 700 /etc/authbind/byuid/$MAAS_UID
+}
+
+restart_apache2(){
+    if [ -x /usr/sbin/invoke-rc.d ]; then
+        invoke-rc.d apache2 restart || true
+    else
+        /etc/init.d/apache2 restart || true
+    fi
+}
+
+configure_maas_url(){
+    # 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
+        maas-provision configure-maas-url "$RET"
+    fi
+}
+
+configure_shared_secret() {
+    db_get maas-cluster-controller/shared-secret || true
+    if [ -n "$RET" ]; then
+        echo "$RET" | maas-provision install-shared-secret
+        chown maas:maas /var/lib/maas/secret
+        chmod 0640 /var/lib/maas/secret
+    fi
+}
+
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+    create_log_dir
+    create_var_dir
+    configure_maas_tgt
+fi
+
+if [ "$1" = "configure" ]; then
+    create_log_dir
+
+    configure_maas_tgt
+    configure_maas_url
+    # Only ask for a shared secret when the region is not installed
+    # on the same system.
+    if [ -n "$DEBCONF_RECONFIGURE" ] && [ ! -f /usr/sbin/maas-region-admin ]; then
+        db_input high maas-cluster-controller/shared-secret
+        db_go
+    fi
+    configure_shared_secret
+
+    # This config file may contain a private cluster UUID.  Only maas
+    # can read it; only root can write it.
+    chown root:maas /etc/maas/maas_cluster.conf
+    chmod 0640 /etc/maas/maas_cluster.conf
+
+    configure_cluster_uuid
+    configure_cluster_authbind
+    enable_apache_version_mod
+    restart_apache2
+    maas-provision upgrade-cluster
+fi
+
+db_stop
+
+#DEBHELPER#
 
=== added file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.postrm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+RELEASE=`lsb_release -rs` || RELEASE=""
+
+case "$1" in
+        purge)
+		# remove log directory
+		rm -rf /var/log/maas
+		# remove var directory
+		DIR=/var/lib/maas
+		if [ "$(ls -A $DIR 2> /dev/null)" = "" ]; then
+			rm -rf /var/lib/maas
+		fi
+
+		# Delete symlink for iSCSI config.
+		if [ -L /etc/tgt/conf.d/maas.conf ]; then
+			rm -rf /etc/tgt/conf.d/maas.conf
+		fi
+
+		# Remove authbind
+		MAAS_UID="`id -u maas`"
+		if [ -f "/etc/authbind/byuid/$MAAS_UID" ]; then
+			rm -rf /etc/authbind/byuid/$MAAS_UID
+		fi
+esac
 
=== added file 'debian/maas-cluster-controller.preinst'
--- debian/maas-cluster-controller.preinst	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.preinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "upgrade" ]; then
+
+    if dpkg --compare-versions "$2" lt 1.7.0~beta3+bzr3066-0ubuntu1; then
+        if [ -f /etc/init/maas-pserv.conf ]; then
+            invoke-rc.d maas-pserv stop
+        fi
+
+        if [ -f /etc/init/maas-cluster-celery.conf ]; then
+            invoke-rc.d maas-cluster-celery stop
+        fi
+
+        if [ -f /var/log/maas/celery.log ]; then
+            rm -rf /var/log/maas/celery.log
+        fi
+    fi
+
+    if dpkg --compare-versions "$2" lt 1.7.0~beta6+bzr3232-0ubuntu1; then
+        if [ -f /etc/init/maas-cluster.conf ]; then
+            invoke-rc.d maas-cluster stop
+        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
+
+    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3523-0ubuntu1; then
+        if [ -f /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
+            rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
+        fi
+    fi
+
+fi
+
+#DEBHELPER#
 
=== added file 'debian/maas-cluster-controller.templates'
--- debian/maas-cluster-controller.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.templates	2015-06-03 20:01:10 +0000
@@ -0,0 +1,16 @@
+Template: maas-cluster-controller/maas-url
+Type: string
+Default:
+_Description: Ubuntu MAAS API address:
+ The MAAS cluster controller and nodes need to contact the MAAS region
+ controller API.  Set the URL at which they can reach the MAAS API remotely,
+ e.g. "http://192.168.1.1/MAAS".
+ Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
+ useful values here.
+
+Template: maas-cluster-controller/shared-secret
+Type: password
+Default:
+_Description: MAAS Cluster Controller Shared Secret:
+ The MAAS Cluster Controller needs to contact the MAAS server
+ with a share secret. Set the shared secret here.
 
=== added file 'debian/maas-common.install'
--- debian/maas-common.install	1970-01-01 00:00:00 +0000
+++ debian/maas-common.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/maas/maas-rsyslog.conf
 
=== added file 'debian/maas-common.logrotate'
--- debian/maas-common.logrotate	1970-01-01 00:00:00 +0000
+++ debian/maas-common.logrotate	2015-06-03 20:01:10 +0000
@@ -0,0 +1,9 @@
+/var/log/maas/maas.log
+{
+        rotate 7
+        daily
+        missingok
+        notifempty
+        delaycompress
+        compress
+}
 
=== added file 'debian/maas-common.maintscript'
--- debian/maas-common.maintscript	1970-01-01 00:00:00 +0000
+++ debian/maas-common.maintscript	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+#TODO: Figure out the right version or whether this is needed.
+#rm_conffile /usr/share/maas/celeryconfig_common.py 1.7.0~beta3+bzr3043-0ubuntu1
 
=== added file 'debian/maas-common.postinst'
--- debian/maas-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-common.postinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+create_log_dir(){
+    # 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
+        touch /var/log/maas/maas.log
+    fi
+    chown syslog:syslog /var/log/maas/maas.log
+}
+
+add_user_group(){
+	local user="maas"
+	local group="maas"
+	local home="/var/lib/maas"
+	addgroup --quiet --system "$group" || true
+	adduser --quiet --system --group --home "$home" "$user" || true
+}
+
+ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog.d/99-maas.conf
+
+add_user_group
+create_log_dir
+
+#DEBHELPER#
 
=== added file 'debian/maas-common.postrm'
--- debian/maas-common.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-common.postrm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+        purge)
+                # Deleting user/group
+                if getent passwd maas >/dev/null; then
+                        deluser maas || true
+                        delgroup maas || true
+                fi
+esac
+
+rm -f /etc/rsyslog.d/99-maas.conf
+
+
+#DEBHELPER#
 
=== added file 'debian/maas-dhcp.apparmor'
--- debian/maas-dhcp.apparmor	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.apparmor	2015-06-03 20:01:10 +0000
@@ -0,0 +1,12 @@
+# Work around bug:
+# https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1186662
+capability dac_override,
+
+/run/maas/dhcp/ r,
+/run/maas/dhcp/** r,
+/run/maas/dhcp/*.pid lrw,
+/run/maas/dhcp/*.trace lrw,
+/run/maas/dhcp/*.leases* lrw,
+/var/lib/maas/dhcp/dhcpd*.leases* lrw,
+/etc/maas/dhcpd.conf r,
+/etc/maas/dhcpd6.conf r,
 
=== added file 'debian/maas-dhcp.install'
--- debian/maas-dhcp.install	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+/debian/tmp/etc/apparmor.d/dhcpd.d/maas
 
=== added file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcpd.service	2015-06-03 20:01:10 +0000
@@ -0,0 +1,27 @@
+[Unit]
+Description=MAAS instance of ISC DHCP server for IPv4
+Documentation=man:dhcpd(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+ConditionPathExists=/etc/maas/dhcpd.conf
+ConditionPathExists=/var/lib/maas/dhcpd-interfaces
+
+[Service]
+# Allow dhcp server to write lease and pid file as 'dhcpd' user
+ExecStartPre=/bin/mkdir -p /run/maas/dhcp
+ExecStartPre=/bin/chown root:root /run/maas/dhcp
+# The leases files need to be root:root even when dropping privileges
+ExecStartPre=/bin/mkdir -p /var/lib/maas/dhcp
+ExecStartPre=/bin/chown root:root /var/lib/maas/dhcp
+# Start the daemon
+ExecStart=/bin/sh -ec '\
+    INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
+    LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \
+    [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
+    chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd.leases*; \
+    exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \
+        -cf /etc/maas/dhcpd.conf -lf $LEASES_FILE $INTERFACES'
+
+[Install]
+WantedBy=multi-user.target
 
=== added file 'debian/maas-dhcp.maas-dhcpd.upstart'
--- debian/maas-dhcp.maas-dhcpd.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcpd.upstart	2015-06-03 20:01:10 +0000
@@ -0,0 +1,65 @@
+description "MAAS instance of ISC DHCP server for IPv4"
+author "Jeroen Vermeulen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+env CONFIG_FILE=/etc/maas/dhcpd.conf
+env PID_DIR=/run/maas/dhcp
+env PID_FILE=/run/maas/dhcp/dhcpd.pid
+env LEASES_DIR=/var/lib/maas/dhcp
+env LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases
+
+# This is where we write what interfaces dhcpd should listen on.
+env INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces
+
+pre-start script
+    if [ ! -f $CONFIG_FILE ]; then
+        echo "$CONFIG_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+
+    if [ ! -f $INTERFACES_FILE ]; then
+        echo "$INTERFACES_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+
+    if ! /usr/sbin/dhcpd -t -q -4 -cf $CONFIG_FILE > /dev/null 2>&1; then
+        echo "dhcpd self-test failed.  Please fix the config file."
+        echo "The error was: "
+        /usr/sbin/dhcpd -t -4 -cf $CONFIG_FILE
+        stop
+        exit 0
+    fi
+end script
+
+respawn
+script
+    INTERFACES=`cat "${INTERFACES_FILE}"`
+
+    # Allow dhcp server to write lease and pid file.
+    mkdir -p $PID_DIR
+    chown dhcpd:dhcpd $PID_DIR
+
+    # As of Quantal, the leases file must be owned by root:root (even though
+    # the daemon will run under an unprivileged user).
+    # In Precise, ownership was supposed to be dhcpd:dhcpd.
+    #
+    # maas packages on saucy are only supported with newer isc-dhcp via
+    # the cloud-archive.  See bug 1231693 for more information, including
+    # a patch that would actually work to support all, but is complex.
+
+    mkdir -p $LEASES_DIR
+    chown root:root $LEASES_DIR
+    [ -e $LEASES_FILE ] || touch $LEASES_FILE
+    for LFILE in $LEASES_FILE $LEASES_FILE~; do
+        if [ -e $LFILE ]; then
+            chown root:root $LFILE
+            chmod a+r $LFILE
+        fi
+    done
+
+    exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
+end script
 
=== added file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service	2015-06-03 20:01:10 +0000
@@ -0,0 +1,27 @@
+[Unit]
+Description=MAAS instance of ISC DHCP server for IPv6
+Documentation=man:dhcpd(8)
+Wants=network-online.target
+After=network-online.target
+After=time-sync.target
+ConditionPathExists=/etc/maas/dhcpd6.conf
+ConditionPathExists=/var/lib/maas/dhcpd-interfaces
+
+[Service]
+# Allow dhcp server to write lease and pid file as 'dhcpd' user
+ExecStartPre=/bin/mkdir -p /run/maas/dhcp
+ExecStartPre=/bin/chown root:root /run/maas/dhcp
+# The leases files need to be root:root even when dropping privileges
+ExecStartPre=/bin/mkdir -p /var/lib/maas/dhcp
+ExecStartPre=/bin/chown root:root /var/lib/maas/dhcp
+# Start the daemon
+ExecStart=/bin/sh -ec '\
+    INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
+    LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases; \
+    [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
+    chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases*; \
+    exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \
+        -cf /etc/maas/dhcpd6.conf -lf $LEASES_FILE $INTERFACES'
+
+[Install]
+WantedBy=multi-user.target
 
=== added file 'debian/maas-dhcp.maas-dhcpd6.upstart'
--- debian/maas-dhcp.maas-dhcpd6.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcpd6.upstart	2015-06-03 20:01:10 +0000
@@ -0,0 +1,65 @@
+description "MAAS instance of ISC DHCP server for IPv6"
+author "Jeroen Vermeulen <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+env CONFIG_FILE=/etc/maas/dhcpd6.conf
+env PID_DIR=/run/maas/dhcp
+env PID_FILE=/run/maas/dhcp/dhcpd6.pid
+env LEASES_DIR=/var/lib/maas/dhcp
+env LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases
+
+# This is where we write what interfaces dhcpd should listen on.
+env INTERFACES_FILE=/var/lib/maas/dhcpd6-interfaces
+
+pre-start script
+    if [ ! -f $CONFIG_FILE ]; then
+        echo "$CONFIG_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+
+    if [ ! -f $INTERFACES_FILE ]; then
+        echo "$INTERFACES_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+
+    if ! /usr/sbin/dhcpd -t -q -6 -cf $CONFIG_FILE > /dev/null 2>&1; then
+        echo "dhcpd self-test failed.  Please fix the config file."
+        echo "The error was: "
+        /usr/sbin/dhcpd -t -6 -cf $CONFIG_FILE
+        stop
+        exit 0
+    fi
+end script
+
+respawn
+script
+    INTERFACES=`cat "${INTERFACES_FILE}"`
+
+    # Allow dhcp server to write lease and pid file.
+    mkdir -p $PID_DIR
+    chown dhcpd:dhcpd $PID_DIR
+
+    # As of Quantal, the leases file must be owned by root:root (even though
+    # the daemon will run under an unprivileged user).
+    # In Precise, ownership was supposed to be dhcpd:dhcpd.
+    #
+    # maas packages on saucy are only supported with newer isc-dhcp via
+    # the cloud-archive.  See bug 1231693 for more information, including
+    # a patch that would actually work to support all, but is complex.
+
+    mkdir -p $LEASES_DIR
+    chown root:root $LEASES_DIR
+    [ -e $LEASES_FILE ] || touch $LEASES_FILE
+    for LFILE in $LEASES_FILE $LEASES_FILE~; do
+        if [ -e $LFILE ]; then
+            chown root:root $LFILE
+            chmod a+r $LFILE
+        fi
+    done
+
+    exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -6 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
+end script
 
=== added file 'debian/maas-dhcp.maintscript'
--- debian/maas-dhcp.maintscript	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maintscript	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/init/maas-dhcp-server.conf 1.7.0~beta6+bzr3231-0ubuntu1
+rm_conffile /etc/init/maas-dhcpv6-server.conf 1.7.0~beta6+bzr3231-0ubuntu1
 
=== added file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.postinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+    # Stop the dhcpd instance that came with the isc-dhcp-server package.
+    # We run our own dhcpd instances.
+    if [ -d /run/systemd/system ]; then
+        systemctl stop isc-dhcp-server >/dev/null || true
+        systemctl disable isc-dhcp-server >/dev/null || true
+    else
+        invoke-rc.d isc-dhcp-server stop
+    fi
+
+    dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
+    if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1
+    then
+       apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" || true
+    fi
+fi
+
+#DEBHELPER#
 
=== added file 'debian/maas-dhcp.postrm'
--- debian/maas-dhcp.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.postrm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+   dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
+   if [ -f "${dhcpd_prof}" ] &&
+      command -v apparmor_parser >/dev/null 2>&1; then
+      apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}"
+   fi
+   if [ "$1" = "purge" ]; then
+      rm -rf /etc/maas/dhcpd.conf
+      rm -rf /etc/maas/dhcpd6.conf
+   fi
+fi
+
+#DEBHELPER#
 
=== added file 'debian/maas-dhcp.preinst'
--- debian/maas-dhcp.preinst	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.preinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.7.0~beta6+bzr3232-0ubuntu1; then
+    if [ -f /etc/init/maas-dhcp-server.conf ]; then
+        invoke-rc.d maas-dhcp-server stop
+    fi
+    if [ -f /etc/init/maas-dhcpv6-server.conf ]; then
+        invoke-rc.d maas-dhcpv6-server stop
+    fi
+fi
+
+#DEBHELPER#
 
=== added file 'debian/maas-dns.dirs'
--- debian/maas-dns.dirs	1970-01-01 00:00:00 +0000
+++ debian/maas-dns.dirs	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+etc/bind/maas
 
=== added file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-dns.postinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+set -e
+
+edit_named_options() {
+    # Remove any existing MAAS-related include line from
+    # /etc/bind/named.conf.local, then re-add it.
+    sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
+    maas-region-admin get_named_conf --edit --config_path /etc/bind/named.conf.local
+
+    # Add a line in /etc/bind/named.conf.options that includes the
+    # /etc/named/maas/named.conf.options.inside.maas file.
+    maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options
+}
+
+fix_dns_permissions() {
+    if [ -d /etc/bind/maas ]; then
+        chown maas:root /etc/bind/maas
+        chown -R maas:maas /etc/bind/maas/*
+    fi
+    if [ -f /etc/bind/maas/named.conf.maas ]; then
+        chown maas:maas /etc/bind/maas/named.conf.maas
+        chmod 644 /etc/bind/maas/named.conf.maas
+    fi
+    if [ -f /etc/bind/maas/named.conf.options.inside.maas ]; then
+        chown maas:maas /etc/bind/maas/named.conf.options.inside.maas
+        chmod 644 /etc/bind/maas/named.conf.options.inside.maas
+    fi
+    if [ -f /etc/bind/maas/rndc.conf.maas ]; then
+        chown maas:root /etc/bind/maas/rndc.conf.maas
+        chmod 600 /etc/bind/maas/rndc.conf.maas
+    fi
+    if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then
+        chown maas:bind /etc/bind/maas/named.conf.rndc.maas
+        chmod 640 /etc/bind/maas/named.conf.rndc.maas
+    fi
+}
+
+# This handles installs and re-configuration
+if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
+    # If /etc/bind/maas is empty, set_up_dns.
+    if [ ! "$(ls -A /etc/bind/maas)" ]; then
+        maas-region-admin set_up_dns
+    fi
+
+    # Fix permissions.
+    fix_dns_permissions
+
+    edit_named_options
+
+elif [ "$1" = "configure" ]; then
+    # Fix permissions
+    fix_dns_permissions
+
+    # If the /etc/bind/named.conf.options is not set up yet, do it now.
+    # This might happen because of an upgrade from an older package.
+    should_edit_named_options=0
+
+    # If the MAAS include statement doesn't exist in named.conf.local, we need to add it.
+    grep -qs '^include\s.*maas' /etc/bind/named.conf.local || should_edit_named_options=1
+
+    # If the 'forwarders' option exists in named.conf.options, it needs to be removed.
+    grep -qs "forwarders" /etc/bind/named.conf.options && should_edit_named_options=1
+
+    # If the 'dnssec-validation' option exists in named.conf.options, it needs to be removed.
+    grep -qs "dnssec-validation" /etc/bind/named.conf.options && should_edit_named_options=1
+
+    # If the include file for the custom MAAS named.conf.options doesn't exist, it needs to be added.
+    grep -qs "named.conf.options.inside.maas" /etc/bind/named.conf.options || should_edit_named_options=1
+    
+    if [ $should_edit_named_options -eq 1 ]; then
+        edit_named_options
+    fi
+fi
+
+invoke-rc.d bind9 restart || true
+
+#DEBHELPER#
 
=== added file 'debian/maas-dns.postrm'
--- debian/maas-dns.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-dns.postrm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+	if [ -f /etc/bind/named.conf.local ]; then
+		sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \
+			/etc/bind/named.conf.local
+		sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.options.inside.maas\"\;$/d' \
+			/etc/bind/named.conf.options
+	fi
+fi
+
+if [ "$1" = "purge" ]; then
+	# Remove zone files
+	if [ -d /etc/bind/maas ]; then
+		rm -rf /etc/bind/maas
+        fi
+fi
+
+if [ -x /usr/sbin/invoke-rc.d ]; then
+	invoke-rc.d bind9 restart || true
+fi
+
+#DEBHELPER#
 
=== added file 'debian/maas-proxy.dirs'
--- debian/maas-proxy.dirs	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.dirs	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+var/log/maas/proxy
 
=== added file 'debian/maas-proxy.install'
--- debian/maas-proxy.install	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,3 @@
+debian/extras/maas-proxy.conf etc/maas/
+debian/extras/maas-proxy-common.sh usr/share/maas/
+debian/extras/squid3.override etc/init/
 
=== added file 'debian/maas-proxy.logrotate'
--- debian/maas-proxy.logrotate	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.logrotate	2015-06-03 20:01:10 +0000
@@ -0,0 +1,24 @@
+#
+# Logrotate fragment for squid-deb-proxy.
+#
+/var/log/maas/proxy/*.log {
+ daily
+ compress
+ delaycompress
+ rotate 2
+ missingok
+ nocreate
+ sharedscripts
+ postrotate
+  if [ -x /usr/sbin/squid ]; then
+      SQUID=/usr/sbin/squid
+  elif  [ -x /usr/sbin/squid3 ]; then
+      SQUID=/usr/sbin/squid3
+  else
+      echo "No squid binary found"
+      exit 1
+  fi
+
+  test ! -e /var/run/maas-proxy.pid || $SQUID -f /etc/maas/maas-proxy.conf -k rotate
+ endscript
+}
 
=== added file 'debian/maas-proxy.maas-proxy.service'
--- debian/maas-proxy.maas-proxy.service	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.maas-proxy.service	2015-06-03 20:01:10 +0000
@@ -0,0 +1,15 @@
+[Unit]
+Description=MAAS Proxy
+Requires=network-online.target
+After=network-online.target
+ConditionPathExists=/etc/maas/maas-proxy.conf
+
+[Service]
+ExecStartPre=/bin/mkdir -p /run/maas/proxy
+ExecStartPre=/bin/sh -ec '\
+    . /usr/share/maas/maas-proxy-common.sh; \
+    pre_start'
+ExecStart=/usr/sbin/squid3 -N -f /etc/maas/maas-proxy.conf
+
+[Install]
+WantedBy=multi-user.target
 
=== added file 'debian/maas-proxy.maas-proxy.upstart'
--- debian/maas-proxy.maas-proxy.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.maas-proxy.upstart	2015-06-03 20:01:10 +0000
@@ -0,0 +1,24 @@
+# maas-proxy - a caching proxy
+#
+
+description "maas-proxy"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+pre-start script
+    . /usr/share/maas/maas-proxy-common.sh
+    pre_start
+end script
+
+script
+  if [ -x /usr/sbin/squid ]; then
+      SQUID=/usr/sbin/squid
+  elif  [ -x /usr/sbin/squid3 ]; then
+      SQUID=/usr/sbin/squid3
+  else
+      echo "No squid binary found"
+      exit 1
+  fi
+  exec $SQUID -N -f /etc/maas/maas-proxy.conf
+end script
 
=== added file 'debian/maas-proxy.postinst'
--- debian/maas-proxy.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.postinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+    # Stop the squid3 instance that came with the isc-dhcp-server package.
+    # We run our own squid3 instances.
+    if [ -d /run/systemd/system ]; then
+        systemctl stop squid3 >/dev/null || true
+        systemctl disable squid3 >/dev/null || true
+    else
+        invoke-rc.d squid3 stop
+    fi
+
+    # Ensure log folder is created.
+    mkdir -p /var/log/maas/proxy
+    chown -R proxy:proxy /var/log/maas/proxy
+
+fi
+
+#DEBHELPER#
 
=== added file 'debian/maas-proxy.postrm'
--- debian/maas-proxy.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-proxy.postrm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+   rm -rf /var/cache/maas-proxy
+   rm -rf /var/log/maas/proxy
+   rm -rf /var/spool/maas-proxy
+   rm -f /etc/maas/maas-proxy.conf
+fi
+
+#DEBHELPER#
 
=== added file 'debian/maas-region-controller-min.apport'
--- debian/maas-region-controller-min.apport	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.apport	2015-06-03 20:01:10 +0000
@@ -0,0 +1,63 @@
+#!/usr/bin/python
+
+'''apport hook for maas-region-controller
+
+(c) 2012-2014 Canonical Ltd.
+Author: Andres Rodriguez <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+import os.path
+import subprocess
+import tempfile
+
+from apport.hookutils import (
+    attach_conffiles,
+    attach_file,
+    attach_file_if_exists,
+    attach_related_packages,
+)
+
+
+def attach_journal_logs(report, key, *units):
+    """Capture logs from systemd's journal."""
+    if os.path.exists("/bin/journalctl"):
+        cmd = ['/bin/journalctl', '--utc', '--since=-24hours']
+        cmd.extend("--unit=%s" % unit for unit in units)
+        with tempfile.NamedTemporaryFile() as logfile:
+            subprocess.call(cmd, stdout=logfile, stderr=logfile)
+            attach_file(report, logfile.name, key)
+
+
+def add_info(report, ui):
+    response = ui.yesno(
+        "The contents of your /etc/maas/maas_local_settings.py, "
+        "/etc/maas/pserv.yaml files may help developers diagnose your bug "
+        "more quickly.  However, it may contain sensitive information.  Do "
+        "you want to include it in your bug report?")
+
+    if response is None:  # user cancelled
+        raise StopIteration
+    elif response is True:
+        attach_conffiles(report, 'maas')
+
+    # Attaching log files (Upstart).
+    attach_file_if_exists(
+        report, '/var/log/maas/regiond.log', 'MAASRegionLog')
+    attach_file_if_exists(
+        report, '/var/log/maas/clusterd.log', 'MAASClusterLog')
+
+    # Attaching log files (systemd). These will overwrite the logs above on a
+    # system where systemd is available.
+    attach_journal_logs(
+        report, "MAASRegionLog", "maas-regiond", "maas-regiond-worker@*")
+    attach_journal_logs(
+        report, "MAASClusterLog", "maas-clusterd")
+
+    # Attaching related packages info
+    attach_related_packages(report, ['python-django-maas', 'apparmor'])
 
=== added file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,34 @@
+# Install project
+debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas
+
+# Install static files
+debian/tmp/usr/share/maas/web/static
+
+# Install Apache Config
+debian/tmp/etc/maas/maas-http.conf
+
+# Install MAAS local settings
+debian/tmp/etc/maas/maas_local_settings.py
+
+# Install new preseed files
+debian/tmp/etc/maas/preseeds
+
+# Install templates
+debian/tmp/etc/maas/templates/dns
+debian/tmp/etc/maas/templates/commissioning-user-data
+debian/tmp/etc/maas/templates/deployment-user-data
+
+# Install driver configuration file
+debian/tmp/etc/maas/drivers.yaml
+
+# Install winrm certificate generation script
+debian/tmp/usr/bin/maas-generate-winrm-cert
+
+# Install twisted plugins
+twisted/plugins/maasregiond.py usr/share/pyshared/twisted/plugins
+
+# Install all other stuff
+debian/extras/maas-region-admin usr/sbin
+debian/extras/20-maas.conf etc/rsyslog.d
+debian/extras/maas_remote_syslog_compress etc/cron.d
+debian/extras/99-maas usr/share/maas/conf
 
=== added file 'debian/maas-region-controller-min.links'
--- debian/maas-region-controller-min.links	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.links	2015-06-03 20:01:10 +0000
@@ -0,0 +1,8 @@
+etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py
+
+# dh-systemd does not yet appear to fully grok template units, so we
+# install unit dependencies directly instead.
+lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/[e-mail]
+lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/[e-mail]
+lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/[e-mail]
+lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/[e-mail]
 
=== added file 'debian/maas-region-controller-min.lintian-overrides'
--- debian/maas-region-controller-min.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.lintian-overrides	2015-06-03 20:01:10 +0000
@@ -0,0 +1,6 @@
+maas-region-controller-min: binary-without-manpage usr/sbin/maas
+maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
+maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
+maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
+maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py
+maas-region-controller-min: script-not-executable etc/maas/templates/deployment-user-data/maas_configure_interfaces.py
 
=== added file 'debian/maas-region-controller-min.logrotate'
--- debian/maas-region-controller-min.logrotate	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.logrotate	2015-06-03 20:01:10 +0000
@@ -0,0 +1,15 @@
+/var/log/maas/regiond.log {
+ rotate 5
+ weekly
+ compress
+ missingok
+ # copytruncate may lose log messages at the moment of rotation, but
+ # there is no better way to integrate twistd and logrotate.
+ copytruncate
+ # The logs are all owned by the `maas` user, so drop privs.
+ su maas maas
+ # Don't rotate unless the log is at least 10MB.
+ minsize 10M
+ # Force rotation if the log grows beyond 50MB.
+ maxsize 50M
+}
 
=== added file 'debian/maas-region-controller-min.maas-regiond-worker.upstart'
--- debian/maas-region-controller-min.maas-regiond-worker.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-regiond-worker.upstart	2015-06-03 20:01:10 +0000
@@ -0,0 +1,25 @@
+description "MAAS Region Controller (Worker)"
+author "Gavin Panella <[e-mail]>"
+
+# This instance job is started by the parent `maas-regiond` job, and
+# stops when that job is stopped. This is differentiated from its
+# siblings by the $core instance argument.
+
+instance $core
+
+stop on stopping maas-regiond
+
+setuid maas
+setgid maas
+
+respawn
+
+kill timeout 15
+
+env DJANGO_SETTINGS_MODULE=maas.settings
+env PYTHONPATH=/usr/share/maas
+env LOGFILE=/var/log/maas/regiond.log
+
+script
+    exec /usr/bin/twistd --nodaemon --pidfile= maas-regiond >> ${LOGFILE} 2>&1
+end script
 
=== added file 'debian/maas-region-controller-min.maas-regiond-worker@.service'
--- debian/maas-region-controller-min.maas-regiond-worker@.service	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-regiond-worker@.service	2015-06-03 20:01:10 +0000
@@ -0,0 +1,27 @@
+[Unit]
+Description=MAAS Region Controller (Worker %i)
+Documentation=https://maas.ubuntu.com/
+Requires=network-online.target
+After=network-online.target
+Requires=postgresql.service
+After=postgresql.service
+PartOf=maas-regiond.service
+# This will go away one we support new config files.
+ConditionPathExists=/etc/maas/maas_local_settings.py
+
+[Service]
+User=maas
+Group=maas
+Restart=always
+Environment="DJANGO_SETTINGS_MODULE=maas.settings"
+Environment="PYTHONPATH=/usr/share/maas:/usr/lib/django16"
+Environment="LOGFILE=/var/log/maas/regiond.log"
+# Logs go to the journal; read them with:
+#   journalctl -u maas-regiond-worker@*
+# Logs also go to $LOGFILE for backward compatibility. The journal
+# should now be preferred as $LOGFILE will be removed in MAAS 1.9.
+ExecStart=/bin/sh -c \
+    'exec twistd --nodaemon --pidfile= maas-regiond 2>&1 | tee -a $LOGFILE'
+
+[Install]
+WantedBy=maas-regiond.service
 
=== added file 'debian/maas-region-controller-min.maas-regiond.service'
--- debian/maas-region-controller-min.maas-regiond.service	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-regiond.service	2015-06-03 20:01:10 +0000
@@ -0,0 +1,24 @@
+[Unit]
+Description=MAAS Region Controller
+Documentation=https://maas.ubuntu.com/
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+# systemd.service(5) clearly states that ExecStart can be specified zero
+# times when Type=oneshot, but it does appears to be needed at present.
+ExecStart=/bin/true
+
+#
+# The maas-region-controller-min package configures four workers. This
+# should work for most people. However:
+#
+# * `systemctl start maas-regiond-worker@x` (where 'x' can be anything,
+#   though integers >= 5 seem logical) will start an additional worker.
+#
+# * `systemctl enable maas-regiond-worker@x` will configure that worker
+#   so that it's persistent across reboots.
+#
+
+[Install]
+WantedBy=multi-user.target
 
=== added file 'debian/maas-region-controller-min.maas-regiond.upstart'
--- debian/maas-region-controller-min.maas-regiond.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-regiond.upstart	2015-06-03 20:01:10 +0000
@@ -0,0 +1,17 @@
+description "MAAS Region Controller"
+author "Gavin Panella <[e-mail]>"
+
+# This starts multiple instances of `maas-regiond-worker` and does
+# nothing else itself; there is no main script so this runs "forever".
+# By default, it launches four workers.
+
+start on filesystem and net-device-up
+stop on runlevel [016]
+
+respawn
+
+pre-start script
+    for core in $(seq 4); do
+        start maas-regiond-worker core=${core}
+    done
+end script
 
=== added file 'debian/maas-region-controller-min.maintscript'
--- debian/maas-region-controller-min.maintscript	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maintscript	2015-06-03 20:01:10 +0000
@@ -0,0 +1,6 @@
+rm_conffile /etc/maas/txlongpoll.yaml 1.7.0~beta4+bzr3124-0ubuntu1
+rm_conffile /etc/init/maas-txlongpoll.conf 1.7.0~beta4+bzr3124-0ubuntu1
+rm_conffile /etc/init/maas-region-celery.conf 1.7.0~beta4+bzr3124-0ubuntu1
+rm_conffile /etc/maas/maas_local_celerconfig.py 1.7.0~beta4+bzr3124-0ubuntu1
+rm_conffile /usr/share/maas/maas_local_celerconfig.py 1.7.0~beta4+bzr3124-0ubuntu1
+rm_conffile /etc/maas/maas_local_celeryconfig.py 1.7.0~beta4+bzr3124-0ubuntu1
 
=== added file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.postinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+RELEASE=`lsb_release -rs` || RELEASE=""
+
+configure_region_http() {
+    case $RELEASE in
+        12.04|12.10|13.04)
+            # handle apache configs
+            if [ -e /etc/maas/maas-http.conf -a \
+                ! -e /etc/apache2/conf.d/maas-http.conf ]; then
+                ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
+            fi
+            ;;
+        *)
+            # handle apache configs
+            if [ -e /etc/maas/maas-http.conf -a \
+                ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
+                ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
+            fi
+            ;;
+    esac
+    # enable apache modules needed
+    a2enmod proxy_http
+    a2enmod expires
+    a2enmod rewrite
+}
+
+configure_logging() {
+	# Give appropriate permissions
+	if [ ! -f /var/log/maas/regiond.log ]; then
+		touch /var/log/maas/regiond.log
+	fi
+	chown maas:maas /var/log/maas/regiond.log
+
+	# Create log directory base
+	mkdir -p /var/log/maas/rsyslog
+	chown -R syslog:syslog /var/log/maas/rsyslog
+	# Make sure rsyslog reads our config
+	invoke-rc.d rsyslog restart
+
+	# apache2 log symlinks
+	ln -sf /var/log/apache2 /var/log/maas/
+}
+
+configure_maas_default_url() {
+    local ipaddr="$1"
+
+    if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then
+        sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/$ipaddr\/MAAS\"/" /etc/maas/maas_local_settings.py
+    fi
+}
+
+get_default_route_ip() {
+    while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do
+        [ "$Mask" = "00000000" ] && break
+    done < /proc/net/route
+    interface="$Iface"
+    ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global)
+    ipaddr=${ipaddr#* inet }
+    ipaddr=${ipaddr%%/*}
+    echo $ipaddr
+}
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+    #########################################################
+    ################ Folder Permissions  ####################
+    #########################################################
+    mkdir -p /var/lib/maas/media/storage
+    chown -R maas:maas /var/lib/maas/
+
+    # Config will contain credentials, so should be readable
+    # by the application but nobody else.
+    chown root:maas /etc/maas/maas_local_settings.py
+    chmod 0640 /etc/maas/maas_local_settings.py
+
+    #########################################################
+    ################  Configure Apache2  ####################
+    #########################################################
+    configure_region_http
+
+    #########################################################
+    ##########  Configure DEFAULT_MAAS_URL  #################
+    #########################################################
+
+    # Obtain IP address of default route and change DEFAULT_MAAS_URL
+    # if default-maas-url has not been preseeded.
+    db_get maas/default-maas-url
+    ipaddr="$RET"
+    if [ -z "$RET" ]; then
+        ipaddr=$(get_default_route_ip)
+    fi
+    # Set the IP address of the interface with default route
+    if [ -n "$ipaddr" ]; then
+        configure_maas_default_url "$ipaddr"
+        db_set maas/default-maas-url "$ipaddr"
+    fi
+
+    #########################################################
+    ################  Configure Logging  ####################
+    #########################################################
+    configure_logging
+
+elif [ -n "$DEBCONF_RECONFIGURE" ]; then
+    # Set the IP address of the interface with default route
+    db_get maas/default-maas-url
+    ipaddr="$RET"
+    if [ -n "$ipaddr" ]; then
+        configure_maas_default_url "$ipaddr"
+    fi
+
+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
+
+    # If upgrading to any later package version, then upgrade db.
+    invoke-rc.d apache2 stop || true
+
+    # make sure maas http config is symlinked
+    configure_region_http
+
+    # we need to regenerate the passwords and update configs.
+    db_get maas/default-maas-url
+    ipaddr="$RET"
+    configure_maas_default_url "$ipaddr"
+fi
+
+invoke-rc.d apache2 restart || true
+
+db_stop
+
+#DEBHELPER#
 
=== added file 'debian/maas-region-controller-min.postrm'
--- debian/maas-region-controller-min.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.postrm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+RELEASE=`lsb_release -rs` ||  RELEASE=""
+
+case "$1" in
+    purge)
+        rm -rf /var/log/maas
+        rm -rf /var/lib/maas
+        case $RELEASE in
+            12.04|12.10|13.04)
+                if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
+                    rm -rf /etc/apache2/conf.d/maas-http.conf
+                fi
+                ;;
+            *)
+                if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
+                    rm -rf /etc/apache2/conf-enabled/maas-http.conf
+                fi
+                ;;
+        esac
+
+        # Restarting apache2
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d apache2 restart || true
+        fi
+
+        # Delete symlink
+        if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
+            rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+        fi
+
+        # Delete any remaining / leftover file
+        rm -rf /usr/share/maas/maas/
+esac
+
+#DEBHELPER#
+
+db_stop
 
=== added file 'debian/maas-region-controller-min.preinst'
--- debian/maas-region-controller-min.preinst	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.preinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.7.0~beta4+bzr3127-0ubuntu1; then
+
+    if [ -f /etc/init/maas-txlongpoll.conf ]; then
+        invoke-rc.d maas-txlongpoll stop
+    fi
+
+    if [ -f /var/log/maas/txlongpoll.log ]; then
+        rm -rf /var/log/maas/txlongpoll.log
+    fi
+
+    if [ -f /etc/init/maas-region-celery.conf ]; then
+        invoke-rc.d maas-region-celery stop
+    fi
+
+    if [ -f /var/log/maas/celery-region.log ]; then
+        rm -rf /var/log/maas/celery-region.log
+    fi
+
+fi
+
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3463-0ubuntu1; then
+
+    if [ -f /var/log/maas/maas-django.log ]; then
+        rm -rf /var/log/maas/maas-django.log
+    fi
+
+fi
+#DEBHELPER#
 
=== added file 'debian/maas-region-controller-min.prerm'
--- debian/maas-region-controller-min.prerm	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.prerm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
+
+invoke-rc.d apache2 stop || true
 
=== added file 'debian/maas-region-controller-min.templates'
--- debian/maas-region-controller-min.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.templates	2015-06-03 20:01:10 +0000
@@ -0,0 +1,22 @@
+Template: maas/installation-note
+Type: note
+Default: false
+_Description: Ubuntu MAAS Server
+ The Ubuntu MAAS Server has been installed in your system. You
+ can access the MAAS Web interface here:
+ .
+    http://${MAAS_URL}/MAAS
+ .
+ If the automatically detected address above is not in the same
+ network as the MAAS clients, you need to reconfigure it:
+ .
+    sudo dpkg-reconfigure maas-region-controller
+
+Template: maas/default-maas-url
+Type: string
+_Description: Ubuntu MAAS PXE/Provisioning network address:
+ The Ubuntu MAAS Server automatically detects the IP address
+ that is used for PXE and provisioning. However, it needs to be
+ in the same network as the clients. If the automatically
+ detected address is not in the same network as the clients, it
+ must be changed. 
 
=== added file 'debian/maas-region-controller.config'
--- debian/maas-region-controller.config	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.config	2015-06-03 20:01:10 +0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+# creates question
+set_question() {
+	if ! db_fget "$1" seen; then
+		db_register dbconfig-common/dbconfig-install "$1"
+		db_subst "$1" ID "$1"
+		db_fget "$1" seen
+	fi
+	if [ "$RET" = false ]; then
+		db_set "$1" "$2"
+		db_fset "$1" seen true
+	fi
+}
+
+# source dbconfig-common shell library, and call the hook function
+if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
+	. /usr/share/dbconfig-common/dpkg/config.pgsql
+fi
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+	# Hide maas/dbconfig-install question by setting default.
+	set_question maas-region-controller/dbconfig-install true
+	set_question maas-region-controller/pgsql/app-pass ""
+
+	dbc_dbname="maasdb"
+	dbc_dbuser="maas"
+	dbc_remove="true"
+
+	dbc_go maas-region-controller $@
+
+elif [ -n "$DEBCONF_RECONFIGURE" ]; then
+	db_get maas/default-maas-url || true
+	if [ -z "$RET" ]; then
+		ipaddr=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"/")} END{print array[3] }' /etc/maas/maas_local_settings.py)
+		db_set maas/default-maas-url "$ipaddr"
+	fi
+	db_input low maas/default-maas-url || true
+	db_go
+fi
 
=== added file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.postinst	2015-06-03 20:01:10 +0000
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
+	. /usr/share/dbconfig-common/dpkg/postinst.pgsql
+fi
+
+RELEASE=`lsb_release -rs` || RELEASE=""
+
+maas_sync_migrate_db(){
+	maas-region-admin syncdb --noinput
+	maas-region-admin migrate maasserver --noinput
+	maas-region-admin migrate metadataserver --noinput
+
+    # This command makes some assumptions about how postgresql works,
+    # so don't assume the package is broken if it fails.
+    maas-region-admin purge_unused_images || true
+}
+
+restart_postgresql(){
+	invoke-rc.d --force postgresql restart || true
+}
+
+configure_maas_database() {
+	local dbc_dbpass="$1"
+	if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then
+		sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/        'PASSWORD': '"$dbc_dbpass"',/" \
+                       /etc/maas/maas_local_settings.py
+	fi
+}
+
+configure_maas_default_url() {
+	local ipaddr="$1"
+
+	if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then
+		sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/MAAS\"/" \
+                    /etc/maas/maas_local_settings.py
+	fi
+}
+
+get_default_route_ip() {
+	while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do
+		[ "$Mask" = "00000000" ] && break
+	done < /proc/net/route
+	interface="$Iface"
+	ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global)
+	ipaddr=${ipaddr#* inet }
+	ipaddr=${ipaddr%%/*}
+        echo $ipaddr
+}
+
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+	#########################################################
+	################ Folder Permissions  ####################
+	#########################################################
+	mkdir -p /var/lib/maas/media/storage
+	chown -R maas:maas /var/lib/maas/
+
+	# Config will contain credentials, so should be readable
+	# by the application but nobody else.
+	chown root:maas /etc/maas/maas_local_settings.py
+	chmod 0640 /etc/maas/maas_local_settings.py
+
+	#########################################################
+	##########  Configure DEFAULT_MAAS_URL  #################
+	#########################################################
+
+	# Obtain IP address of default route and change DEFAULT_MAAS_URL
+	# if default-maas-url has not been preseeded.
+	db_get maas/default-maas-url
+	ipaddr="$RET"
+	if [ -z "$RET" ]; then
+		ipaddr=$(get_default_route_ip)
+	fi
+	# Set the IP address of the interface with default route
+	if [ -n "$ipaddr" ]; then
+		configure_maas_default_url "$ipaddr"
+		db_subst maas/installation-note MAAS_URL "$ipaddr"
+		db_set maas/default-maas-url "$ipaddr"
+	fi
+
+	#########################################################
+	################  Configure Database  ###################
+	#########################################################
+
+	# Need to for postgresql start so it doesn't fail on the installer
+	restart_postgresql
+
+	# Create the database
+	dbc_go maas-region-controller $@
+	configure_maas_database "$dbc_dbpass"
+
+	# Only syncdb if we have selected to install it with dbconfig-common.
+	db_get maas-region-controller/dbconfig-install
+	if [ "$RET" = "true" ]; then
+		maas_sync_migrate_db
+	fi
+
+	# Display installation note
+	db_input low maas/installation-note || true
+	db_go
+
+elif [ -n "$DEBCONF_RECONFIGURE" ]; then
+	# Set the IP address of the interface with default route
+	db_get maas/default-maas-url
+	ipaddr="$RET"
+	if [ -n "$ipaddr" ]; then
+		configure_maas_default_url "$ipaddr"
+	fi
+
+elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
+	# If upgrading to any later package version, then upgrade db.
+	invoke-rc.d apache2 stop || true
+
+	# make sure postgresql is running
+	restart_postgresql
+
+	# we need to regenerate the passwords and update configs.
+	db_get maas/default-maas-url
+	ipaddr="$RET"
+	configure_maas_default_url "$ipaddr"
+	# handle database upgrade
+	if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
+		# source dbconfig-common db config for maas-region-controller
+		# before upgrading database, otherwise a new config is written
+		# but the password is no longer preserved.
+		. /etc/dbconfig-common/maas-region-controller.conf
+	else
+		dbc_go maas-region-controller $@
+	fi
+	configure_maas_database "$dbc_dbpass"
+
+	maas_sync_migrate_db
+
+fi
+
+invoke-rc.d maas-regiond restart || true
+invoke-rc.d apache2 restart || true
+
+if [ -f /etc/init/maas-clusterd.conf ]; then
+	invoke-rc.d maas-clusterd restart || true
+fi
+
+db_stop
+
+#DEBHELPER#
 
=== added file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.postrm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+RELEASE=`lsb_release -rs` ||  RELEASE=""
+
+if [ -f /etc/dbconfig-common/maas.conf ]; then
+	if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+		. /usr/share/dbconfig-common/dpkg/postrm.pgsql
+		dbc_go maas-region-controller $@
+	fi
+fi
+
+case "$1" in
+	purge)
+		rm -rf /var/log/maas
+		rm -rf /var/lib/maas
+		case $RELEASE in
+			12.04|12.10|13.04)
+				if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
+					rm -rf /etc/apache2/conf.d/maas-http.conf
+				fi
+				;;
+			*)
+				if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
+					rm -rf /etc/apache2/conf-enabled/maas-http.conf
+				fi
+				;;
+		esac
+
+		# Restarting apache2
+		if [ -x /usr/sbin/invoke-rc.d ]; then
+			invoke-rc.d apache2 restart || true
+		fi
+
+		# Delete symlink
+		if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
+			rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+		fi
+
+esac
+
+#DEBHELPER#
+
+db_stop
 
=== added file 'debian/maas-region-controller.prerm'
--- debian/maas-region-controller.prerm	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.prerm	2015-06-03 20:01:10 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
+
+invoke-rc.d apache2 stop || true
+invoke-rc.d maas-regiond stop || true
+
+. /usr/share/dbconfig-common/dpkg/prerm.pgsql
+dbc_go maas-region-controller $@
 
=== added file 'debian/maintscript'
--- debian/maintscript	1970-01-01 00:00:00 +0000
+++ debian/maintscript	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/init/maas-celery.conf 0.1+bzr971+dfsg-0ubuntu2
+rm_conffile /etc/dbconfig-common/maas.conf 0.1+bzr971+dfsg-0ubuntu2
 
=== added directory 'debian/patches'
=== added file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-fix-database-settings.patch	2015-06-03 20:01:10 +0000
@@ -0,0 +1,17 @@
+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': '',
+-        'PASSWORD': '',
++        'NAME': 'maasdb',
++        'USER': 'maas',
++        'PASSWORD': 'maas',
+         'HOST': 'localhost',
+     }
+ }
 
=== added file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-pserv-config.patch	2015-06-03 20:01:10 +0000
@@ -0,0 +1,18 @@
+Description: Use default settings for MAAS PSERV
+ Use default settings for MAAS pserv. These default settings
+ include port, logfile, oops directory, cobbler url and username
+Author: Andres Rodriguez <[e-mail]>
+
+=== modified file 'etc/maas/pserv.yaml'
+Index: maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml
+===================================================================
+--- maas-1.8.0~beta5+bzr3849.orig.orig/etc/maas/pserv.yaml	2015-04-29 02:40:55.703960406 -0400
++++ maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml	2015-04-29 02:41:10.567959953 -0400
+@@ -18,7 +18,6 @@
+   # resource_root: /var/lib/maas/boot-resources/current/
+ 
+   # port: 69
+-  port: 5244
+   ## The URL to be contacted to generate PXE configurations.
+   # generator: http://localhost/MAAS/api/1.0/pxeconfig/
+   generator: http://localhost:5240/MAAS/api/1.0/pxeconfig/
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+01-fix-database-settings.patch
+02-pserv-config.patch
 
=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] maas-region-controller.templates
+[type: gettext/rfc822deb] maas-cluster-controller.templates
 
=== added file 'debian/po/templates.pot'
--- debian/po/templates.pot	1970-01-01 00:00:00 +0000
+++ debian/po/templates.pot	2015-06-03 20:01:10 +0000
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: maas\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-10-04 13:40-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../maas-region-controller.templates:1001
+msgid "Ubuntu MAAS Server"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../maas-region-controller.templates:1001
+msgid ""
+"The Ubuntu MAAS Server has been installed in your system. You can access the "
+"MAAS Web interface here:"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../maas-region-controller.templates:1001
+msgid "   http://${MAAS_URL}/MAAS"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../maas-region-controller.templates:1001
+msgid ""
+"If the automatically detected address above is not in the same network as "
+"the MAAS clients, you need to reconfigure it:"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../maas-region-controller.templates:1001
+msgid "   sudo dpkg-reconfigure maas-region-controller"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-region-controller.templates:2001
+msgid "Ubuntu MAAS PXE/Provisioning network address:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-region-controller.templates:2001
+msgid ""
+"The Ubuntu MAAS Server automatically detects the IP address that is used for "
+"PXE and provisioning. However, it needs to be in the same network as the "
+"clients. If the automatically detected address is not in the same network as "
+"the clients, it must be changed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-cluster-controller.templates:1001
+msgid "Ubuntu MAAS API address:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-cluster-controller.templates:1001
+msgid ""
+"The MAAS Cluster Controller needs to contact the MAAS server to register its "
+"presence.  Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS"
+msgstr ""
 
=== added file 'debian/python-django-maas.install'
--- debian/python-django-maas.install	1970-01-01 00:00:00 +0000
+++ debian/python-django-maas.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python*/dist-packages/maasserver
+debian/tmp/usr/lib/python*/dist-packages/metadataserver
 
=== added file 'debian/python-maas-client.install'
--- debian/python-maas-client.install	1970-01-01 00:00:00 +0000
+++ debian/python-maas-client.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/python*/dist-packages/apiclient
 
=== added file 'debian/python-maas-provisioningserver.install'
--- debian/python-maas-provisioningserver.install	1970-01-01 00:00:00 +0000
+++ debian/python-maas-provisioningserver.install	2015-06-03 20:01:10 +0000
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/python*/dist-packages/provisioningserver
+
+# Install other stuff
+debian/extras/maas-provision usr/sbin
+debian/extras/maas-probe-dhcp usr/sbin
 
=== added file 'debian/python-maas-provisioningserver.lintian-overrides'
--- debian/python-maas-provisioningserver.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/python-maas-provisioningserver.lintian-overrides	2015-06-03 20:01:10 +0000
@@ -0,0 +1,2 @@
+python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision
+python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-probe-dhcp
 
=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2015-06-03 20:01:10 +0000
@@ -0,0 +1,77 @@
+#!/usr/bin/make -f
+
+BUILDHOME = $(CURDIR)/debian/build
+PYTHON = $(shell pyversions -d)
+# Python enum modules.
+py_enums := $(wildcard src/*/enum.py)
+
+%:
+	dh $@ --with python2,apport,systemd --buildsystem=python_distutils
+
+override_dh_installinit:
+	# maas-clusterd
+	dh_systemd_enable --name maas-clusterd
+	dh_installinit --name maas-clusterd
+	dh_systemd_start --name maas-clusterd
+	# maas-regiond
+	dh_systemd_enable --name maas-regiond
+	dh_installinit --name maas-regiond
+	dh_systemd_start --name maas-regiond
+	# maas-regiond-worker
+	dh_installinit --no-start --name maas-regiond-worker  # Upstart
+	dh_installinit --no-start --name maas-regiond-worker@  # systemd
+	# maas-dhcpd
+	dh_systemd_enable --name maas-dhcpd
+	dh_installinit --name maas-dhcpd
+	dh_systemd_start --name maas-dhcpd
+	# maas-dhcpd6
+	dh_systemd_enable --name maas-dhcpd6
+	dh_installinit --name maas-dhcpd6
+	dh_systemd_start --name maas-dhcpd6
+	# maas-proxy
+	dh_systemd_enable --name maas-proxy
+	dh_installinit --name maas-proxy
+	dh_systemd_start --name maas-proxy
+
+override_dh_auto_build:
+	dh_auto_build
+
+	mkdir -p $(BUILDHOME)
+	HOME=$(BUILDHOME) PYTHONPATH=$(CURDIR)/src/ $(PYTHON)	\
+		$(CURDIR)/src/maasserver/utils/jsenums.py	\
+		$(py_enums) > $(BUILDHOME)/enums.js
+
+override_dh_auto_install:
+	dh_auto_install
+
+	# Move static files
+	install -d -m 755  $(CURDIR)/debian/tmp/usr/share/maas/web/static
+	mv $(CURDIR)/debian/tmp/usr/lib/python*/*-packages/maasserver/static \
+                $(CURDIR)/debian/tmp/usr/share/maas/web/
+
+	# Remove scss directory from static files
+	rm -rf $(CURDIR)/debian/tmp/usr/share/maas/web/scss
+
+	# Install built enums.js file.
+	cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/
+
+	# install the apparmor profile
+	install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d
+	install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \
+	    $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas
+
+	dh_install --list-missing
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(BUILDHOME)
+	rm -rf src/*.egg-info
+
+DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
+REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
+              | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')
+VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
+              | sed -rne 's,^Version: ([^-]+).*,\1,p')
+get-orig-source:
+	bzr export -r $(REV) --root=maas-$(VER).orig \
+             maas_$(VER).orig.tar.gz lp:maas
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2015-06-03 20:01:10 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2015-06-03 20:01:10 +0000
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\.dfsg// \
+http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.*