Merge lp:~andreserl/maas/home_user_lp1399016 into lp:maas/trunk

Proposed by Andres Rodriguez on 2014-12-05
Status: Merged
Approved by: Raphaël Badin on 2014-12-05
Approved revision: 3399
Merged at revision: 3399
Proposed branch: lp:~andreserl/maas/home_user_lp1399016
Merge into: lp:maas/trunk
Diff against target: 9 lines (+1/-1)
1 file modified
contrib/maas-http.conf (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/home_user_lp1399016
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2014-12-05 Approve on 2014-12-05
Review via email:

Commit message

Ensure that WSGI has a home defined for the user

To post a comment you must log in.
Raphaël Badin (rvb) :
review: Approve
MAAS Lander (maas-lander) wrote :
Download full text (19.6 KiB)

The attempt to merge lp:~andreserl/maas/home_user_lp1399016 into lp:maas failed. Below is the output from the failed tests.

Ign trusty-security InRelease
Get:1 trusty-security Release.gpg [933 B]
Get:2 trusty-security Release [62.0 kB]
Ign trusty InRelease
Ign trusty-updates InRelease
Hit trusty Release.gpg
Get:3 trusty-updates Release.gpg [933 B]
Hit trusty Release
Get:4 trusty-updates Release [62.0 kB]
Hit trusty/main Sources
Get:5 trusty-security/main Sources [54.1 kB]
Hit trusty/universe Sources
Hit trusty/main amd64 Packages
Hit trusty/universe amd64 Packages
Hit trusty/main Translation-en
Hit trusty/universe Translation-en
Get:6 trusty-updates/main Sources [144 kB]
Get:7 trusty-security/universe Sources [17.4 kB]
Get:8 trusty-security/main amd64 Packages [168 kB]
Get:9 trusty-updates/universe Sources [93.0 kB]
Get:10 trusty-security/universe amd64 Packages [73.0 kB]
Get:11 trusty-updates/main amd64 Packages [371 kB]
Hit trusty-security/main Translation-en
Hit trusty-security/universe Translation-en
Get:12 trusty-updates/universe amd64 Packages [222 kB]
Hit trusty-updates/main Translation-en
Hit trusty-updates/universe Translation-en
Ign trusty/main Translation-en_US
Ign trusty/universe Translation-en_US
Fetched 1,269 kB in 3s (421 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-o...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'contrib/maas-http.conf'
--- contrib/maas-http.conf 2014-09-23 19:09:47 +0000
+++ contrib/maas-http.conf 2014-12-05 15:19:48 +0000
@@ -1,4 +1,4 @@
1WSGIDaemonProcess maas user=maas group=maas processes=2 threads=1 display-name=%{GROUP}1WSGIDaemonProcess maas user=maas group=maas home=/var/lib/maas processes=2 threads=1 display-name=%{GROUP}
3# Without this, defining a tag as a malformed xpath expression will hang3# Without this, defining a tag as a malformed xpath expression will hang
4# the region controller.4# the region controller.