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

[Andres Rodriguez]

Split into different binary packages (maas,python-django-maas), and handle maas apache config.
Release 0.1+bzr232+dfsg-0ubuntu1
Open 0.1+bzr233+dfsg-0ubuntu1

[Raphaël Badin (rvb)]

84 +++ debian/maas.dirs 2012-03-07 17:58:26 +0000
85 @@ -0,0 +1,1 @@
86 +var/lib/maas/static/

I know close to nothing about packaging so please bear but maybe we should have var/lib/maas/media/ in here too…?

[Andres Rodriguez (andreserl)]

Yes. However, at the moment is not being created as I will handle that once I completely integrate the collect stuff, as I already uploaded maas to the archives.

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-01 23:31:20 +0000
+++ debian/changelog	2012-03-07 17:58:26 +0000
@@ -1,6 +1,11 @@
-maas (0.1+bzr204+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr233+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * UNRELEASED
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 07 Mar 2012 12:51:12 -0500
+
+maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low
+
   * New upstream snapshot.
 
   [ Dave Walker ]
@@ -15,8 +20,10 @@
     - 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]>  Thu, 01 Mar 2012 18:23:56 -0500
+ -- Andres Rodriguez <[e-mail]>  Wed, 07 Mar 2012 12:46:17 -0500
 
 maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-03-01 23:31:20 +0000
+++ debian/control	2012-03-07 17:58:26 +0000
@@ -2,24 +2,39 @@
 Section: net
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 8), python-all (>= 2.7), python-distribute
+Build-Depends: debhelper (>= 8), python-dev (>= 2.7), python-distribute
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.7
 Homepage: https://launchpad.net/maas
 
 Package: maas
 Architecture: all
-Depends: postgresql-9.1,
-         python-psycopg2,
+Depends: ${misc:Depends},
+         ${python:Depends},
+         apache2,
+         postgresql-9.1,
          python-django,
+         python-django-maas (>= ${binary:Version}),
          python-django-piston,
          python-django-south,
+         squid3
+Description: The next step in the development of orchestra.
+ It provides an easy to use UI to provision your Ubuntu servers.
+
+Package: python-django-maas
+Architecture: all
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python-oops,
+         python-oops-amqp,
+         python-oops-datedir-repo,
+         python-oops-twisted,
+         python-oops-wsgi,
+         python-psycopg2,
          python-setproctitle,
          python-sphinx,
          python-twisted,
-         python-zope.interface,
-         squid3,
-         ${misc:Depends},
-         ${python:Depends}
-Description: The next step in the development of orchestra.
+         python-txamqp,
+         python-zope.interface
+Description: The next step in the development of Orchestra.
  It provides an easy to use UI to provision your Ubuntu servers.

=== added file 'debian/maas.dirs'
--- debian/maas.dirs	1970-01-01 00:00:00 +0000
+++ debian/maas.dirs	2012-03-07 17:58:26 +0000
@@ -0,0 +1,1 @@
+var/lib/maas/static/

=== modified file 'debian/maas.install'
--- debian/maas.install	2012-03-01 23:31:20 +0000
+++ debian/maas.install	2012-03-07 17:58:26 +0000
@@ -1,5 +1,24 @@
+# Install project
+debian/tmp/usr/lib/python*/dist-packages/maas/__init__.py usr/share/maas/maas
+debian/tmp/usr/lib/python*/dist-packages/maas/demo.py usr/share/maas/maas
+debian/tmp/usr/lib/python*/dist-packages/maas/development.py usr/share/maas/maas
+debian/tmp/usr/lib/python*/dist-packages/maas/production.py usr/share/maas/maas
+debian/tmp/usr/lib/python*/dist-packages/maas/settings.py usr/share/maas/maas
+debian/tmp/usr/lib/python*/dist-packages/maas/urls.py usr/share/maas/maas
+
+# Install Apache Config
+contrib/maas-http.conf etc/maas
+
+# Install MaaS local settings
+debian/tmp/usr/share/maas/maas_local_settings.py
+
+# Install WSGI
+contrib/wsgi.py usr/share/maas
+
+# Install all other stuff
+debian/extras/squid.conf usr/share/maas/conf
+etc/cron.d/maas-import-isos
 etc/maas/import_isos
-etc/cron.d/maas-import-isos
+man/maas-import-isos.8 usr/share/man/man8
 scripts/maas-import-isos usr/sbin
-man/maas-import-isos.8 usr/share/man/man8
-debian/extras/squid.conf usr/share/maas/conf
+

=== added file 'debian/maas.links'
--- debian/maas.links	1970-01-01 00:00:00 +0000
+++ debian/maas.links	2012-03-07 17:58:26 +0000
@@ -0,0 +1,1 @@
+usr/share/maas/maas_local_settings.py etc/maas/maas_local_settings.py

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-03-01 23:31:20 +0000
+++ debian/maas.postinst	2012-03-07 17:58:26 +0000
@@ -2,6 +2,18 @@
 
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
 
+	# handle apache
+	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
+
+	# enable apache modules needed
+	a2enmod expires
+
+	# restart apache
+	invoke-rc.d apache2 restart
+
 	# Handle squid integration
 	if [ -e /etc/squid3/squid.conf ] ; then
 		cp /etc/squid3/squid.conf /etc/squid3/squid.conf.orig

=== added file 'debian/python-django-maas.install'
--- debian/python-django-maas.install	1970-01-01 00:00:00 +0000
+++ debian/python-django-maas.install	2012-03-07 17:58:26 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/python*/dist-packages/maasserver
+debian/tmp/usr/lib/python*/dist-packages/metadataserver
+debian/tmp/usr/lib/python*/dist-packages/provisioningserver

=== modified file 'debian/rules'
--- debian/rules	2012-02-16 21:30:01 +0000
+++ debian/rules	2012-03-07 17:58:26 +0000
@@ -3,6 +3,16 @@
 %:
 	dh $@ --with python2 --buildsystem=python_distutils
 
+override_dh_auto_install:
+	dh_auto_install
+
+	# Copy the local config file
+	install -d -m 755  $(CURDIR)/debian/tmp/usr/share/maas
+	cp $(CURDIR)/contrib/maas_local_settings_sample.py \
+                $(CURDIR)/debian/tmp/usr/share/maas/maas_local_settings.py
+
+	dh_install --list-missing
+
 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')