Merge lp:~jml/libdep-service/juju into lp:libdep-service

[Jonathan Lange]

Add a Juju charm for deploying libdep-service.

Juju charm for deploying libdep-service.

It's a bit rough-and-ready at this stage, but it works, and that's a good point for review.

Derived from lp:pkgme-service's fabric deploy task. I stripped out everything that pkgme-service has that libdep-service doesn't (oops, preflight, postgres support). All of these things will need to be added back in eventually.

Obvious things I'm missing right now:
 * making poor use of juju's config, partly because I don't know how, more because I don't know why
 * really bad use of interfaces

The branch also converts libdep-service to use django-configglue. Arguably this should be put into a separate branch. I'd be happy to do that if anyone else actually cares.

The XXXs should all be self-explanatory. Feedback on any of them would be appreciated.

Obviously this duplicates stuff (e.g. add_if_present) from lp:pkgme-service, which is bad. Not sure what to do about that.

I'm quite new to puppet, wsgi, django and juju, so I'm guessing there's plenty to improve.

http://paste.ubuntu.com/1053013/ has notes from my Juju experiences that should probably be converted into something more useful. Have also filed heaps of bugs on various tools.

Thanks,
jml

[Clint Byrum (clint-fewbar)]

First, you will want to run 'charm proof' to see any policy or format errors:

E: no copyright file
E: template relations should be renamed to fit charm: relation-name
E: template interface names should be changed: interface-name
E: template relations should be renamed to fit charm: relation-name
E: template interface names should be changed: interface-name
E: template relations should be renamed to fit charm: relation-name
E: template interface names should be changed: interface-name

All of those need to be addressed before charm store inclusion.

For the interfaces, better to leave those out entirely until you know what they are and can provide an implementation.

* hooks/install: DEBIAN_FRONTEND=noninteractive is assumed to be set now in all charms (since the version in Ubuntu precise anyway).

* hooks/install: better way to do cd's is to use pushd/popd so you don'at have to track BASE_DIR. Otherwise, no.

* dev-config/apply: get_public_hostname() can be deleted, as PUBLIC_HOSTNAME must be changed to just $(unit-get public-address). This way it will work the same on all providers.

* dev-config/apply: I love the way puppet is used, as this is far more reliable than hand-coded shell to do everything in an idempotent way. I do think the whole package list from install could also be put into the puppet manifest.

* hooks/start, stop: These are actually important for the future. Eventually they'll be used when units are migrated or rebooted. Make sure to consider what needs to be run in those instances and put them here.

Otherwise, this looks great. You might consider just embedding exports in the charm, rather than bzr branching from launchpad, as that will eliminate a dependency to have launchpad available.

review: Needs Fixing

[James Westby (james-w)]

170 +file { "$::basedir/libdep.log":

Is that actually written to by pkgme-devportal (or any other code)? Not so
important, but I don't think we currently log anything in that code.

311 +# XXX: Would be great to depend on more stable URLs. e.g. /+branch/foo.

You can just use

  bzr branch https://code.launchpad.net/libdep-service

392 +# XXX: Is there a better way to do this ``cd`` business?
393 +BASE_DIR=${PWD}
394 +cd libdep-service/sourcecode/pkgme && python setup.py build

Doing this as

(cd libdep-service/sourcecode/pkgme && python setup.py build)

does the cd in a sub-shell, and so the main shell's CWD is unaffected,
saving the cd back.

750 + # TODO: remove the production_credentials.cfg fallback once it is no
751 + # longer in use on production. It's left here now to ease rollouts.
752 + if not add_if_present('production_credentials.cfg', also_add='nondev.cfg'):

That's gone in pkgme-service trunk, and isn't needed here.

This is shaping up pretty well to get something green.

Thanks,

James

review: Needs Fixing

[lp:~jml/libdep-service/juju]

38. By Jonathan Lange on 2012-06-22

Remove interfaces.

39. By Jonathan Lange on 2012-06-22

Add a copyright file to cure lint warnings. Don't worry, we'll GPL soon.

40. By Jonathan Lange on 2012-06-22

Better way of getting the public host name.

41. By Jonathan Lange on 2012-06-22

Strip all the sudo, hopefully revealing Juju's own native DEBIAN_FRONTEND=noninteractive
Run 'cd' commands in a subshell

42. By Jonathan Lange on 2012-06-22

Right revision number. Actually drop all the 'sudo'.

43. By Jonathan Lange on 2012-06-22

More stable URLs for branches.

44. By Jonathan Lange on 2012-06-22

Remove not-needed production_credentials fallback.

45. By Jonathan Lange on 2012-06-22

Last cleanup

46. By Jonathan Lange on 2012-06-22

Rebase revision

[Jonathan Lange (jml)]

Thanks Clint & James. I've applied the suggested fixes. Would appreciate follow-up.

Note that the goal is not to enter the charm store yet. We need a useful service for that first.

[lp:~jml/libdep-service/juju]

47. By Jonathan Lange on 2012-06-22

Correct license file for Canonical charms.

[James Westby (james-w)]

Hi,

I think this looks good as a first cut now, thanks.

a "bzr ignore sourcecode/*" would be appreciated by webops.

Thanks,

James

review: Approve

[lp:~jml/libdep-service/juju]

48. By Jonathan Lange on 2012-06-22

The webops will appreciate this, I'm told.

49. By Jonathan Lange on 2012-06-22

Correct copyright.

[Jonathan Lange (jml)]

Done.

=== modified file '.bzrignore'
--- .bzrignore	2012-06-15 14:59:04 +0000
+++ .bzrignore	2012-06-22 13:06:20 +0000
@@ -1,2 +1,3 @@
 virtualenv
 libdep_service.egg-info
+sourcecode/*

=== added directory 'charms'
=== added directory 'charms/precise'
=== added directory 'charms/precise/libdep-service'
=== added file 'charms/precise/libdep-service/README'
--- charms/precise/libdep-service/README	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/README	2012-06-22 13:06:20 +0000
@@ -0,0 +1,38 @@
+Overview
+--------
+
+This charm provides (service) from (service homepage). Add a description here
+of what the service itself actually does.
+
+
+Usage
+-----
+
+Step by step instructions on using the charm:
+
+    juju deploy servicename
+
+and so on. If you're providing a web service or something that the end user
+needs to go to, tell them here, especially if you're deploying a service that
+might listen to a non-default port.
+
+You can then browse to http://ip-address to configure the service.
+
+Configuration
+-------------
+
+The configuration options will be listed on the charm store, however If you're
+making assumptions or opinionated decisions in the charm (like setting a
+default administrator password), you should detail that here so the user knows
+how to change it immediately, etc.
+
+
+Contact Information
+-------------------
+
+Though this will be listed in the charm store itself don't assume a user will
+know that, so include that information here:
+
+Author: Jonathan Lange <[e-mail]>
+Report bugs at: http://bugs.launchpad.net/libdep-service
+Location: http://jujucharms.com

=== added file 'charms/precise/libdep-service/copyright'
--- charms/precise/libdep-service/copyright	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/copyright	2012-06-22 13:06:20 +0000
@@ -0,0 +1,17 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: Copyright 2012, Canonical Ltd., All Rights Reserved.
+License: GPL-3
+ 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 3 of the License.
+ .
+ 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+

=== added directory 'charms/precise/libdep-service/dev-config'
=== added file 'charms/precise/libdep-service/dev-config/apply'
--- charms/precise/libdep-service/dev-config/apply	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/dev-config/apply	2012-06-22 13:06:20 +0000
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Beware running this on a system you care about, it may overwrite anything
+# on that system. Generally this should only be used on throwaway or dedicated
+# systems.
+
+set -e
+
+CREDS_FILE="${HOME}/credentials"
+
+has_cred() {
+  CRED="$1"
+  if [ -f "$CREDS_FILE" ]; then
+      if grep -q "$CRED" "$CREDS_FILE"; then
+          return 0
+      fi
+  fi
+  return 1
+}
+
+get_cred() {
+  CRED="$1"
+  VALUE="$(grep "$CRED" "$CREDS_FILE" | sed -e 's/[^=]*=//')"
+  echo $VALUE
+}
+
+generate_cred() {
+  CRED="$1"
+  VALUE="${RANDOM}"
+  echo "${CRED}=${VALUE}" >> $CREDS_FILE
+  get_cred $CRED
+}
+
+get_cred_or_generate() {
+  CRED="$1"
+  if has_cred "$CRED"; then
+      get_cred "$CRED"
+  else
+      generate_cred "$CRED"
+  fi
+}
+
+
+DJANGO_SECRET_KEY=$(get_cred_or_generate "DJANGO_SECRET_KEY")
+PUBLIC_HOSTNAME=$(unit-get public-address)
+
+# Export these things to puppet (via facter)
+export FACTER_basedir="`pwd`/libdep-service"
+export FACTER_django_secret_key=$DJANGO_SECRET_KEY
+export FACTER_public_hostname=$PUBLIC_HOSTNAME
+export FACTER_sqlite_database="jml-is-lazy.db"
+
+sudo -E puppet apply --templatedir "$(pwd)/dev-config/templates" "$(pwd)/dev-config/manifests/libdep_service.pp"

=== added directory 'charms/precise/libdep-service/dev-config/manifests'
=== added file 'charms/precise/libdep-service/dev-config/manifests/libdep_service.pp'
--- charms/precise/libdep-service/dev-config/manifests/libdep_service.pp	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/dev-config/manifests/libdep_service.pp	2012-06-22 13:06:20 +0000
@@ -0,0 +1,110 @@
+$wsgi_user = "libdep"
+$wsgi_processes = 2
+$wsgi_threads = 2
+
+$unix_user = "libdep"
+
+group {$unix_user:
+  ensure => 'present',
+}
+
+user {$unix_user:
+  comment => 'This user was created by Puppet',
+  ensure => 'present',
+  gid => $unix_user,
+  require => Group[$unix_user],
+  # Needed to create /home/libdep, which is 'needed' by pkgme.
+  managehome => true,
+}
+
+file { "$::basedir/django_project/nondev_credentials.cfg":
+  content => template("nondev_credentials.cfg.erb"),
+  owner => $unix_user,
+  group => $unix_user,
+  mode => 640,
+  require => [
+              Group[$unix_user],
+              File["$::basedir/django_project/"],
+              ],
+}
+
+file { [ "/home/$unix_user/.config",
+         "/home/$unix_user/.config/pkgme-binary" ]:
+  ensure => directory,
+}
+
+file { "/home/$unix_user/.config/pkgme-binary/conf":
+  content => template("pkgme-devportal.conf.erb"),
+  owner => $unix_user,
+  group => www-data,
+  mode => 640,
+  require => [
+              File["/home/$unix_user/.config/pkgme-binary"],
+              ],
+}
+
+file { "$::basedir/django_project/":
+  owner => $unix_user,
+  group => $unix_user,
+  mode => 644,
+  require => [
+              Group[$unix_user],
+  ],
+  ensure => directory,
+}
+
+file { "$::basedir/libdep.log":
+  owner => $unix_user,
+  group => $unix_user,
+  mode => 644,
+  ensure => present,
+}
+
+file { "$::basedir/django.log":
+  owner => $unix_user,
+  group => $unix_user,
+  mode => 644,
+  ensure => present,
+}
+
+exec { "django-syncdb":
+  command => "python ./manage.py syncdb --noinput",
+  cwd => "$::basedir/django_project",
+  path => ["/usr/bin"],
+  user => $unix_user,
+  require => [
+              File["$::basedir/django_project/nondev_credentials.cfg"],
+              File["$::basedir/libdep.log"],
+              File["$::basedir/django.log"],
+              ],
+  logoutput => on_failure,
+  loglevel => err,
+}
+
+exec { "django-migrate":
+  command => "python ./manage.py migrate",
+  cwd => "$::basedir/django_project",
+  path => ["/usr/bin"],
+  user => $unix_user,
+  environment => "HOME=$::basedir",
+  require => Exec["django-syncdb"],
+}
+
+file { "$::basedir/django_project/django.wsgi":
+  content => template("django.wsgi.erb"),
+  require => [
+              File["$::basedir/django_project/nondev_credentials.cfg"],
+              ]
+}
+
+file { "/etc/apache2/httpd.conf":
+  content => template("httpd.conf.erb"),
+}
+
+exec { "/etc/init.d/apache2 reload":
+  user => root,
+  require => [
+              File["/etc/apache2/httpd.conf"],
+              File["$::basedir/django_project/django.wsgi"],
+              ],
+}

=== added directory 'charms/precise/libdep-service/dev-config/templates'
=== added file 'charms/precise/libdep-service/dev-config/templates/django.wsgi.erb'
--- charms/precise/libdep-service/dev-config/templates/django.wsgi.erb	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/dev-config/templates/django.wsgi.erb	2012-06-22 13:06:20 +0000
@@ -0,0 +1,21 @@
+import os
+import sys
+
+basepath = '<%= basedir %>'
+extra_paths = [basepath, '<%= basedir %>/django_project']
+
+sourcecode_path = os.path.abspath(os.path.join(basepath, 'sourcecode'))
+for filename in os.listdir(sourcecode_path):
+    dependency_path = os.path.join(sourcecode_path, filename)
+    if os.path.isdir(dependency_path):
+        extra_paths.append(dependency_path)
+
+for path in extra_paths:
+    if path not in sys.path:
+        sys.path.insert(0, path)
+
+os.environ['LIBDEP_LOG_DIR'] = '<%= basedir %>'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'django_project.settings'
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()

=== added file 'charms/precise/libdep-service/dev-config/templates/httpd.conf.erb'
--- charms/precise/libdep-service/dev-config/templates/httpd.conf.erb	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/dev-config/templates/httpd.conf.erb	2012-06-22 13:06:20 +0000
@@ -0,0 +1,12 @@
+#Alias /assets/ /srv/<%= basedir %>/project/static/
+#
+#<Directory /srv/<%= basedir %>/project/static>
+#Order deny,allow
+#Allow from all
+#</Directory>
+
+WSGIDaemonProcess <%= basedir %> user=<%= wsgi_user %> processes=<%= wsgi_processes %> threads=<%= wsgi_threads %>
+WSGIProcessGroup <%= basedir %>
+WSGIPassAuthorization On
+
+WSGIScriptAlias / <%= basedir %>/django_project/django.wsgi

=== added file 'charms/precise/libdep-service/dev-config/templates/nondev_credentials.cfg.erb'
--- charms/precise/libdep-service/dev-config/templates/nondev_credentials.cfg.erb	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/dev-config/templates/nondev_credentials.cfg.erb	2012-06-22 13:06:20 +0000
@@ -0,0 +1,19 @@
+[django]
+databases = databases
+secret_key = <%= django_secret_key %>
+
+[databases]
+default = default_database
+
+[default_database]
+engine = django.db.backends.sqlite3
+name = <%= sqlite_database %>
+
+[djlibdep]
+libdep_log_dir = <%= basedir %>
+
+[django_file_logging_handler]
+level = INFO
+class = logging.handlers.WatchedFileHandler
+formatter = verbose
+filename = <%= basedir %>/django.log

=== added file 'charms/precise/libdep-service/dev-config/templates/pkgme-devportal.conf.erb'
--- charms/precise/libdep-service/dev-config/templates/pkgme-devportal.conf.erb	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/dev-config/templates/pkgme-devportal.conf.erb	2012-06-22 13:06:20 +0000
@@ -0,0 +1,3 @@
+[database]
+db_type = sqlite
+path = <%= basedir %>/django_project/<%= sqlite_database %>

=== added directory 'charms/precise/libdep-service/hooks'
=== added file 'charms/precise/libdep-service/hooks/install'
--- charms/precise/libdep-service/hooks/install	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/hooks/install	2012-06-22 13:06:20 +0000
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+LP="https://code.launchpad.net"
+LIBDEP_BRANCH="${LP}/libdep-service"
+PKGME_BRANCH="${LP}/pkgme"
+PKGME_DEVPORTAL_BRANCH="${LP}/pkgme-devportal"
+CONFIGGLUE_BRANCH="${LP}/configglue"
+DJANGO_CONFIGGLUE_BRANCH="${LP}/django-configglue"
+
+# Don't install recommends, as Canonical IS don't either.
+echo APT::Install-Recommends "false"\; | tee /etc/apt/apt.conf.d/30-no-install-recommends
+
+apt-get update -q
+
+# Upgrade the base system in case we are shipping any updates in our PPAs.
+
+# XXX: initscript fails in lxc instances:
+#   http://permalink.gmane.org/gmane.linux.kernel.containers.lxc.general/3724
+# This is a work-around.
+rmdir /dev/shm
+ln -s /run/shm /dev/shm
+
+apt-get dist-upgrade -q -y
+
+# Install the dependencies needed to get puppet going
+# TODO: move the rest of the dependencies to puppet
+# XXX: Should this list be stored as config data somewhere?
+
+# What you might call "deployment process dependencies"
+apt-get install -q -y --force-yes bzr apache2 libapache2-mod-wsgi puppet wget
+
+# XXX: This list probably over-specifies.  Is meant to include:
+# - libdep-service direct dependencies
+# - pkgme-devportal direct dependencies (because we install it from branch)
+# - pkgme direct dependencies (because pkgme is a dependency of
+#   pkgme-devportal that we install from a branch)
+#
+# XXX: Using sqlite3 just to get this damn charm going, but actually want
+# postgresql-9.1
+#
+# TODO: Move these into puppet.  Requires moving the 'setup.py build' calls as well.
+apt-get install -q -y --force-yes \
+    sqlite3 \
+    python-django \
+    python-django-south \
+    python-launchpadlib \
+    python-fixtures \
+    python-storm \
+    python-cheetah \
+    python-markdown \
+    python-testtools \
+    python-xdg \
+    python-httplib2 \
+    python-keyring \
+    python-lazr.restfulclient \
+    python-lazr.uri \
+    python-oauth \
+    python-simplejson \
+    python-testresources \
+    python-wadllib \
+    python-wsgi-intercept \
+    python-zope.interface
+
+# XXX: ERROR: Couldn't get a file descriptor referring to the console
+# Is this actually a problem?
+
+# Grab the branches
+# TODO: investigate re-using IS' config-manager config
+# XXX: can we store this as config data somewhere?
+bzr branch -q $LIBDEP_BRANCH libdep-service
+bzr branch -q $PKGME_BRANCH libdep-service/sourcecode/pkgme
+bzr branch -q $PKGME_DEVPORTAL_BRANCH libdep-service/sourcecode/pkgme-devportal
+bzr branch -q $CONFIGGLUE_BRANCH libdep-service/sourcecode/configglue
+bzr branch -q $DJANGO_CONFIGGLUE_BRANCH libdep-service/sourcecode/django-configglue
+
+# XXX: Heaps of setup.py warnings
+# /usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'entry_points'
+# /usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'convert_2to3_doctests'
+# /usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'use_2to3'
+# /usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'include_package_data'
+# /usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'install_requires'
+# /usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'test_suite'
+#
+# Do they matter?
+
+(cd libdep-service/sourcecode/pkgme && python setup.py build)
+(cd libdep-service/sourcecode/pkgme-devportal && python setup.py build)
+
+# Grab canonical-memento and use it?
+
+# Run puppet to set everything else up.
+./dev-config/apply

=== added file 'charms/precise/libdep-service/hooks/relation-name-relation-broken'
--- charms/precise/libdep-service/hooks/relation-name-relation-broken	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/hooks/relation-name-relation-broken	2012-06-22 13:06:20 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+# This hook runs when the full relation is removed (not just a single member)

=== added file 'charms/precise/libdep-service/hooks/relation-name-relation-changed'
--- charms/precise/libdep-service/hooks/relation-name-relation-changed	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/hooks/relation-name-relation-changed	2012-06-22 13:06:20 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+# This must be renamed to the name of the relation. The goal here is to
+# affect any change needed by relationships being formed, modified, or broken
+# This script should be idempotent.
+juju-log $JUJU_REMOTE_UNIT modified its settings
+juju-log Relation settings:
+relation-get
+juju-log Relation members:
+relation-list

=== added file 'charms/precise/libdep-service/hooks/relation-name-relation-departed'
--- charms/precise/libdep-service/hooks/relation-name-relation-departed	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/hooks/relation-name-relation-departed	2012-06-22 13:06:20 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+# This must be renamed to the name of the relation. The goal here is to
+# affect any change needed by the remote unit leaving the relationship.
+# This script should be idempotent.
+juju-log $JUJU_REMOTE_UNIT departed

=== added file 'charms/precise/libdep-service/hooks/relation-name-relation-joined'
--- charms/precise/libdep-service/hooks/relation-name-relation-joined	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/hooks/relation-name-relation-joined	2012-06-22 13:06:20 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+# This must be renamed to the name of the relation. The goal here is to
+# affect any change needed by relationships being formed
+# This script should be idempotent.
+juju-log $JUJU_REMOTE_UNIT joined

=== added file 'charms/precise/libdep-service/hooks/start'
--- charms/precise/libdep-service/hooks/start	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/hooks/start	2012-06-22 13:06:20 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'

=== added file 'charms/precise/libdep-service/hooks/stop'
--- charms/precise/libdep-service/hooks/stop	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/hooks/stop	2012-06-22 13:06:20 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30

=== added file 'charms/precise/libdep-service/metadata.yaml'
--- charms/precise/libdep-service/metadata.yaml	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/metadata.yaml	2012-06-22 13:06:20 +0000
@@ -0,0 +1,6 @@
+name: libdep-service
+summary: Web services that tells you which binary packages provide a dependency.
+maintainer: Jonathan Lange <[e-mail]>
+description: |
+  Sometimes you want to be able to tell what binary packages offer a given
+  library. This service does that.

=== added file 'charms/precise/libdep-service/revision'
--- charms/precise/libdep-service/revision	1970-01-01 00:00:00 +0000
+++ charms/precise/libdep-service/revision	2012-06-22 13:06:20 +0000
@@ -0,0 +1,1 @@
+1

=== added file 'django_project/dev.cfg'
--- django_project/dev.cfg	1970-01-01 00:00:00 +0000
+++ django_project/dev.cfg	2012-06-22 13:06:20 +0000
@@ -0,0 +1,18 @@
+[django]
+databases = databases
+
+[django_file_logging_handler]
+level = INFO
+class = logging.handlers.WatchedFileHandler
+formatter = verbose
+filename = django.log
+
+[databases]
+default = default_database
+
+[default_database]
+engine = django.db.backends.sqlite3
+name = test.db
+
+[djlibdep]
+libdep_log_dir = .

=== added file 'django_project/main.cfg'
--- django_project/main.cfg	1970-01-01 00:00:00 +0000
+++ django_project/main.cfg	2012-06-22 13:06:20 +0000
@@ -0,0 +1,70 @@
+[django]
+debug = true
+template_debug = %(debug)s
+installed_apps =
+    django.contrib.auth
+    django.contrib.contenttypes
+    django.contrib.sessions
+    django.contrib.sites
+    django.contrib.messages
+    django.contrib.staticfiles
+    django.contrib.admin
+    djlibdep
+    south
+    django_configglue
+time_zone = UTC
+language_code = en-us
+site_id = 1
+use_i18n = false
+use_l10n = false
+middleware_classes =
+    django.middleware.common.CommonMiddleware
+    django.contrib.sessions.middleware.SessionMiddleware
+    django.middleware.csrf.CsrfViewMiddleware
+    django.contrib.auth.middleware.AuthenticationMiddleware
+    django.contrib.messages.middleware.MessageMiddleware
+root_urlconf = django_project.urls
+logging = django_logging
+authentication_backends = django_openid_auth.auth.OpenIDBackend
+                          django.contrib.auth.backends.ModelBackend
+template_context_processors = django.contrib.auth.context_processors.auth
+                              django.core.context_processors.request
+
+[django_logging]
+version = 1
+disable_existing_loggers = True
+formatters = django_logging_formatters
+handlers = django_logging_handlers
+loggers = django_logging_loggers
+root = django_logging_root
+
+[django_logging_root]
+level = WARNING
+
+[django_logging_loggers]
+django = django_logger
+djpkgme = djpkgme_logger
+
+[django_logger]
+handlers = file
+level = WARNING
+
+[djpkgme_logger]
+handlers = file
+level = INFO
+
+[django_logging_handlers]
+file = django_file_logging_handler
+null = django_null_logging_handler
+
+[django_null_logging_handler]
+level = DEBUG
+class = django.utils.log.NullHandler
+
+[django_logging_formatters]
+verbose = django_verbose_logging_formatter
+
+[django_verbose_logging_formatter]
+# Double escaped as configglue interpolates once, and we need the rest to survive
+# until django interpolates.
+format = %%(levelname)s %%(asctime)s %%(module)s %%(process)d %%(thread)d %%(message)s

=== modified file 'django_project/manage.py'
--- django_project/manage.py	2012-06-08 14:41:29 +0000
+++ django_project/manage.py	2012-06-22 13:06:20 +0000
@@ -1,4 +1,13 @@
 #!/usr/bin/python
+import os
+import sys
+
+sourcecode_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'sourcecode')
+for filename in os.listdir(sourcecode_path) + ['..', '../django_project']:
+    dependency_path = os.path.join(sourcecode_path, filename)
+    if os.path.isdir(dependency_path):
+        sys.path.insert(0, dependency_path)
+
 from django.core.management import execute_manager
 try:
     import settings # Assumed to be in the same directory.

=== added file 'django_project/schema.py'
--- django_project/schema.py	1970-01-01 00:00:00 +0000
+++ django_project/schema.py	2012-06-22 13:06:20 +0000
@@ -0,0 +1,13 @@
+import django
+from configglue import schema
+from django_configglue.schema import schemas
+
+
+DjangoSchema = schemas.get(django.get_version())
+
+
+class DjlibdepSchema(DjangoSchema):
+
+    class djlibdep(schema.Section):
+
+        libdep_log_dir = schema.StringOption()

=== modified file 'django_project/settings.py'
--- django_project/settings.py	2012-06-08 15:25:12 +0000
+++ django_project/settings.py	2012-06-22 13:06:20 +0000
@@ -1,80 +1,50 @@
-# Django settings for django_project project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', '[e-mail]'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = 'test.db'      # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = ')wpm+3!fok#gq4@pjw=(-4yvcrfl93zp398c^b8$k)cek1rd)o'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-ROOT_URLCONF = 'django_project.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'djlibdep',
-)
+import os
+
+from django_configglue.utils import configglue
+from schema import DjlibdepSchema
+
+basedir = os.path.abspath(os.path.dirname(__file__))
+paths = [os.path.join(basedir, 'main.cfg')]
+
+
+def add_if_present(path, also_add=None):
+    """Add a path to the global `paths` list if it is present on disk.
+
+    If `path` is present on disk then it adds it to the global `paths`
+    list and returns True.
+
+    If `path` is not present on disk then it does nothing and returns
+    False.
+
+    If `also_add` is not None and `path` is added to `paths` then
+    `also_add` will also be added to `paths`. If `path` is not added
+    then neither will `also_add`.
+
+    :param path: the path to check and add
+    :type path: str
+    :param also_add: a path to also add if `path` is added, or
+        None to only add the one path. The default is None.
+    :type path: str or None
+    """
+    global paths
+    new_path = os.path.join(basedir, path)
+    if os.path.exists(new_path):
+        if also_add:
+            paths.append(os.path.join(basedir, also_add))
+        paths.append(new_path)
+        return True
+    return False
+
+
+# Used to choose between dev and non-dev settings.
+if not add_if_present('nondev_credentials.cfg', also_add='nondev.cfg'):
+    add_if_present('dev.cfg')
+
+
+# Used to override settings in tests.
+test_settings_path = os.environ.get('DJLIBDEP_TEST_SETTINGS_PATH', None)
+if test_settings_path:
+    paths.append(test_settings_path)
+
+# make django aware of configglue-based configuration
+configglue(DjlibdepSchema, paths, __name__)

=== added directory 'sourcecode'