Merge lp:~mistotebe/charms/precise/openerp-server/proper-hooks into lp:charms/openerp-server

[mistotebe]

This fixes the openerp-server charm. Also, it allows the user to set their own version in case they want to use OCB branches or custom code.

[Matt Bruzek (mbruzek)]

mistotebe,

Thank you for the work on the openerp-server charm! This Merge Proposal is an improvement and the charmers appreciate the time and effort put in here.

Thanks for updating the README document! I followed the instructions and was able to deploy openerp based soley on the README. That is excellent work!

README

It would be even better if the README contained more information. Typically we like to see links to the upstream code location, links to documentation and how to file bugs. If you have charm-tools installed run the command: juju charm add readme that will generate a README.ex template that you can use to fill in the missing sections. One section I would highly suggest improving is a description of configuration options (especially the ones you added) and what values would be good to use. I understand the values are described in config.yaml, but the README is the place to describe them too.

I ran our linting tool called charm proof against the charm. There are still some warnings in the charm that we would like to see cleared up:
$ juju charm proof
W: Metadata is missing categories.
W: No icon.svg file.
I: relation openerp has no hooks

W: Metadata is missing categories.
The categories is an easy fix, we have some documenation about categories here: https://juju.ubuntu.com/docs/authors-charm-writing.html#make-some-metadata.yaml

W: No icon.svg file.
You can create an icon for this charm and it will be easier to recognize in the GUI. There are instructions here: https://juju.ubuntu.com/docs/authors-charm-icon.html

I: relation openerp has no hooks
Each relationship should have its own set of hooks. The charm provides an openerp relation but there are no hooks to handle this.

Amulet tests:

Thank you for adding amulet tests for this charm! Repeatable tests are key to make sure our charms are robust and automated tests can be run against our charms.

00test.sh
This tests does not run as root, so you need to add sudo to each of those commands. Also add a -y on apt-get install amulet so it can run automatically. The tests failed to run because of this problem.

Based on the test failure I have to put this Merge Proposal in “Work in Progress”. Please fix the tests, address the other issues. When you are ready move the status back to Needs Review and a charmer will take a look at the changes.

Your changes were very well done and greatly appreciated. Just a few minor changes and it should be ready for the charm store! Thanks again for your efforts I look forward to seeing this charm in the store soon.

If you have questions or need any further information you can find mbruzek on IRC. You can contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>

=== modified file 'README'
--- README	2012-03-25 17:55:07 +0000
+++ README	2014-07-01 15:19:11 +0000
@@ -1,54 +1,43 @@
 Juju charm OpenERP
 ==================
 
-:Author: Patrick Hetu <[e-mail]>
+:Author: Patrick Hetu <[e-mail]>, Ondrej Kuznik <[e-mail]>
+
+OpenERP is a comprehensive open source management system. It has a large,
+active community, which has developed modules to handle all facets of company
+management.
+
+These include, amongst others: Sales Management, CRM, Manufacturing, Stock,
+Accounting, Human Resources, Project Management, Logistics, Productivity and
+Document Management.
+
+OpenERP allows you to start easily with one module to fit a specific need then
+add additional modules as and when you need them enabling you to have a
+powerful feature rich Enterprise Resource Planner.
 
 Example deployment
 ------------------
 
-1. First bootstrap your environment::
-
-        juju bootstrap
-
-2. On a diffent terminal starts the log collection with the command::
-
-        juju debug-log
-
-3. Then in the first terminal create the services and expose them to the Internet::
-
-        juju deploy postgresql
-        juju deploy openerp-web
-        juju deploy openerp-server
-        
-        juju add-relation openerp-server:db postgresql:db-admin
-        juju add-relation openerp-web openerp-server
-        
-        juju expose openerp-web
-        juju expose openerp-server
-
-4. Accessing your openerp:
-
-   For the web interface, it should be ready at::
-
-       http://<your_server_address> 
-
-   To find out the public address of openerp-web, look for it in the output of the
-   `juju status` command.  
-
-   For the XML-RPC interface look for the public address of openerp-server. It
-   is running there on port 8070.
-
-3. If you have not set a master password:
-
-   To be able to create database via the web interface, you must know the
-   master password. You will found it in the logs collected by the `juju debug-log`
-   command. If you need it later, the password is in the `/etc/openerp-server.conf`
-   configuration file. You can read it by running this command:
-
-      cat /etc/openerp-server.conf
-
-   after have logged in the openerp-server server. The command will show you a
-   line with the password looking like this:
-
-      admin_passwd = <the_password>
-
+After you have bootstrapped your deployment, do the following:
+  - deploy the openerp-server and postgresql charms to your environment
+  - add a relation between them (pick the 'db-admin' one)
+  - if you have not chosen the admin password for the openerp-server charm yet,
+    do it now
+  - expose the openerp-server charm (there is also the openerp-web charm in
+    case you want to achieve better scalability by separating the roles)
+
+Accessing your OpenERP:
+-----------------------
+
+If you have exposed this charm, you can access your server by visiting
+http://<your-address>:8069. If you have set up openerp-web or even a web
+proxy/load balancer, consult their documentation to find out how to expose
+and connect to them.
+
+If this charm is exposed, the NETRPC/XML-RPC interface is available at port
+8070.
+
+The first time you access the charm, a wizard will greet you that lets you
+create a new database, you will need the password you configured for that. If
+you have not set it during deployment, you will have to specify it to be able
+to create new databases.

=== modified file 'config.yaml'
--- config.yaml	2012-04-05 01:08:51 +0000
+++ config.yaml	2014-07-01 15:19:11 +0000
@@ -3,24 +3,51 @@
       type: string
       default: ""
       description: |
-        This is master password that allows database operation. Leave
-        it empty will generate one for you. Note the this
-        configuration is only valid at installation time and cannot be changed
-        afterwards.
+        This is master password that allows database operation. While empty,
+        the service will not be started.
     origin:
       type: string
       default: "lp"
       description: |
         This is the location to download OpenERP. It can be the keyword: distro,
-        or lp. With lp you can set a version number. Note the this
-        configuration is only valid at installation time and cannot be changed
-        afterwards.
+        lp, or lp-ocb. With lp you can set a version number. Note that when
+        changing this configuration you lose most customizations done already.
     version:
       type: string
-      default: "/6.1"
-      description: |
-        This set the version of the code to install. Empty string will download
-        the trunk version. Don't forget the / at the beginning if you set a
-        version number. Note the this configuration is only valid at
-        installation time and cannot be changed afterwards.
+      default: "/7.0"
+      description: |
+          This sets the version of the code to install when source is lp or
+          lp-ocb. Empty string will download the trunk version. Don't forget
+          the / at the beginning if you set a version number. Note that when
+          changing this configuration you lose most customizations done
+          already.
+    bzr_url_server:
+      type: string
+      default: ""
+      description: |
+        If set and origin starts with "lp", this a URL from which to download
+        the sources of OpenERP core server. Use it if you want to use sources
+        from a custom repository. Note that when changing this configuration
+        you lose most customizations done already.
+    bzr_url_addons:
+      type: string
+      default: ""
+      description: |
+        If set and origin starts with "lp", this a URL from which to download
+        the sources of OpenERP core addons. Use it if you want to use sources
+        from a custom repository. Note that when changing this configuration
+        you lose most customizations done already.
+    bzr_url_web:
+      type: string
+      default: ""
+      description: |
+        If set and origin starts with "lp", this a URL from which to download
+        the sources of OpenERP web frontend. Use it if you want to use sources
+        from a custom repository. Note that when changing this configuration
+        you lose most customizations done already.
+    extra_packages:
+      type: string
+      default: ""
+      description: |
+        Extra packages to be installed on the system.
 

=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2014-07-01 15:19:11 +0000
@@ -0,0 +1,58 @@
+#!/bin/bash
+# vim: et ai ts=2 sw=2:
+
+PATH="$PATH:$CHARM_DIR/hooks/tools"
+. $CHARM_DIR/hooks/tools/common
+. $CHARM_DIR/hooks/tools/bzr
+
+is_config_valid || exit 0
+
+set -e # -x for verbose logging to juju debug-log
+
+install_packages $(config-get extra_packages)
+
+if is_launchpad; then
+  if is_package_installed openerp-server; then
+    apt-get remove openerp-server
+  fi
+  
+  add_user
+  resolve_config_urls
+  resolve_current_urls
+
+  cd /srv/
+  if [[ $CURRENT_SERVER_URL == $SERVER_URL ]]; then
+    cd openobject-server/
+
+    if [[ $CURRENT_ADDONS_URL != $ADDONS_URL ]]; then
+      rm -rf addons
+      bzr_checkout "${ADDONS_URL}" addons
+    fi
+
+    if [[ $CURRENT_WEB_URL != $WEB_URL ]]; then
+      rm -r web
+      bzr_checkout "${WEB_URL}" web
+    fi
+  else
+    rm -rf openobject-server
+
+    bzr_checkout "${SERVER_URL}" openobject-server
+
+    cd openobject-server/
+    bzr_checkout "${ADDONS_URL}" addons
+    bzr_checkout "${WEB_URL}" web
+  fi
+else
+  if [[ -e /srv/openobject-server ]]; then
+    juju-log "Removing juju checkout"
+    rm -rf /srv/openobject-server
+  fi
+
+  juju-log "Installing with distro packages"
+  install_packages openerp-server python-ldap python-imaging
+fi
+
+generate_config
+
+juju-log "(Re)Starting OpenERP service"
+$CHARM_DIR/hooks/restart

=== added file 'hooks/db-relation-departed'
--- hooks/db-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/db-relation-departed	2014-07-01 15:19:11 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+# vim: et ai ts=2 sw=2:
+
+set -e # -x for verbose logging to juju debug-log
+
+rm -f /etc/openerp-server.conf /etc/openerp_db.conf
+
+juju-log "Stopping OpenERP service"
+$CHARM_DIR/hooks/stop

=== modified file 'hooks/db-relation-joined'
--- hooks/db-relation-joined	2012-03-28 19:45:05 +0000
+++ hooks/db-relation-joined	2014-07-01 15:19:11 +0000
@@ -1,56 +1,32 @@
 #!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-ORIGIN=$(config-get origin)
-
-ADMIN_PASSWD=`config-get admin_passwd`
+# vim: et ai ts=2 sw=2:
+
+PATH="$PATH:$CHARM_DIR/hooks/tools"
+. $CHARM_DIR/hooks/tools/common
+
+set -e # -x for verbose logging to juju debug-log
+
 database_user=`relation-get user`
 database_password=`relation-get password`
 database_host=`relation-get host`
+database_port=`relation-get port`
 database_name=`relation-get database`
 
 # All values are set together, so checking on a single value is enough
 # If $user is not set, DB is still setting itself up, we exit awaiting next run
 [ -z "$database_user" ] && exit 0
 
-if [[ -z $ADMIN_PASSWD ]] && \
-   [[ true == $(grep admin_passwd /etc/openerp-server.conf > /dev/null || echo "true") ]]; then
-
-  juju-log "No password set, generating one"
-  ADMIN_PASSWD=`pwgen -s 16`
-  juju-log "Password: ${ADMIN_PASSWD}"
-
-elif [[ true == $(grep admin_passwd /etc/openerp-server.conf > /dev/null && echo "true") ]]; then
-
-  juju-log "A password is in the config file set using this one"
-  line=$(grep admin_passwd /etc/openerp-server.conf)
-  ADMIN_PASSWD=$(echo ${line} | cut -d" " -f 3)
-
-fi
-
-
-cat > /etc/openerp-server.conf <<EOF
-[options]
-admin_passwd = ${ADMIN_PASSWD}
+cat >/etc/openerp_db.conf <<EOF
 db_user = ${database_user}
 db_password = ${database_password}
 db_host = ${database_host}
-db_port = 5432
+db_port = ${database_port}
 EOF
 
-
-if [[ $ORIGIN == lp ]]; then
-  USERNAME=openerp
-
-  juju-log "Adding openerp user"
-
-  if ! getent passwd $USERNAME >/dev/null; then
-      adduser --quiet --disabled-password \
-              --gecos "OpenERP User" \
-              $USERNAME
-  fi
-
+add_user
+generate_config
+
+if is_launchpad; then
   cat > /etc/init/openerp-server.conf << EOF
 description "OpenERP web interface."
 
@@ -62,22 +38,12 @@
 chdir /srv/openobject-server
 exec su -c "./openerp-server --config=/etc/openerp-server.conf --addons-path=addons,web/addons --load=web" openerp
 EOF
-
-  juju-log "Starting OpenERP service"
-
-  start openerp-server || restart openerp-server
-
-else
-
-  juju-log "Starting OpenERP service"
-
-  service openerp-server start || service openerp-server restart
-
 fi
 
+is_config_valid || exit 0
+
+juju-log "(Re)Starting OpenERP service"
+$CHARM_DIR/hooks/restart
+
 open-port 8069/tcp
 open-port 8070/tcp
-
-chown openerp /etc/openerp-server.conf
-chmod 640 /etc/openerp-server.conf
-

=== modified file 'hooks/install'
--- hooks/install	2012-03-25 17:37:23 +0000
+++ hooks/install	2014-07-01 15:19:11 +0000
@@ -1,36 +1,43 @@
 #!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
+# vim: et ai ts=2 sw=2:
+
+PATH="$PATH:$CHARM_DIR/hooks/tools"
+. $CHARM_DIR/hooks/tools/common
+. $CHARM_DIR/hooks/tools/bzr
+
+set -e # -x for verbose logging to juju debug-log
 
 ORIGIN=$(config-get origin)
 VERSION=$(config-get version)
 
+install_packages
 apt-get -y install debconf debconf-utils bzr pwgen
-
-if [[ $ORIGIN == lp ]]; then
-
-  juju-log "Installing with openerp reposirory at version: ${VERSION}"
-
-  apt-get -y update
-  apt-get install -y python-zsi python-werkzeug python-vobject python-vatnumber \
+install_packages $(config-get extra_packages)
+
+if is_launchpad; then
+  juju-log "Installing with launchpad"
+  resolve_config_urls
+
+  install_packages \
+python-zsi python-werkzeug python-vobject python-vatnumber \
 python-simplejson python-reportlab python-yaml python-webdav python-tz \
 python-openid python-dateutil python-pydot python-psycopg2 python-mako \
 python-lxml python-gdata python-feedparser python-babel python-setuptools \
 python-pychart python-markupsafe python-ldap python-imaging python-libxslt1 \
-python-xlwt --no-install-recommends
+python-xlwt python-unittest2 python-mock python-docutils
 
   cd /srv/
-  bzr checkout --lightweight lp:openobject-server${VERSION} openobject-server
+  bzr_checkout "${SERVER_URL}" openobject-server
+
   cd openobject-server/
-  bzr checkout --lightweight lp:openobject-addons${VERSION} addons
-  bzr checkout --lightweight lp:openerp-web${VERSION} web
+  bzr_checkout "${ADDONS_URL}" addons
+  bzr_checkout "${WEB_URL}" web
 
 else
 
   juju-log "Installing with distro packages"
 
-  apt-get -y update
-  apt-get install -y openerp-server python-ldap python-imaging --no-install-recommends
+  install_packages openerp-server python-ldap python-imaging
 
 fi
 

=== added file 'hooks/restart'
--- hooks/restart	1970-01-01 00:00:00 +0000
+++ hooks/restart	2014-07-01 15:19:11 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PATH="$PATH:$CHARM_DIR/hooks/tools"
+. $CHARM_DIR/hooks/tools/common
+is_config_valid && [[ -e /etc/openerp-server.conf ]] || exit 0
+
+set -eu # -x for verbose logging to juju debug-log
+
+service openerp-server start || service openerp-server restart

=== modified file 'hooks/start'
--- hooks/start	2012-04-05 02:00:21 +0000
+++ hooks/start	2014-07-01 15:19:11 +0000
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+PATH="$PATH:$CHARM_DIR/hooks/tools"
+. $CHARM_DIR/hooks/tools/common
+is_config_valid && [[ -e /etc/openerp-server.conf ]] || exit 0
+
 set -eu # -x for verbose logging to juju debug-log
 
 service openerp-server start || true

=== modified file 'hooks/stop'
--- hooks/stop	2012-04-05 02:00:21 +0000
+++ hooks/stop	2014-07-01 15:19:11 +0000
@@ -1,6 +1,8 @@
-i#!/bin/bash
+#!/bin/bash
+
+PATH="$PATH:$CHARM_DIR/hooks/tools"
+. $CHARM_DIR/hooks/tools/common
 
 set -eu # -x for verbose logging to juju debug-log
 
-
 service openerp-server stop

=== added directory 'hooks/tools'
=== added file 'hooks/tools/bzr'
--- hooks/tools/bzr	1970-01-01 00:00:00 +0000
+++ hooks/tools/bzr	2014-07-01 15:19:11 +0000
@@ -0,0 +1,50 @@
+#!/bin/bash
+# vim: et ai ts=2 sw=2:
+
+resolve_config_urls() {
+  ORIGIN=$(config-get origin)
+  VERSION=$(config-get version)
+
+  SERVER_URL=$(config-get bzr_url_server)
+  ADDONS_URL=$(config-get bzr_url_addons)
+  WEB_URL=$(config-get bzr_url_web)
+
+  if [[ $ORIGIN == lp-ocb ]]; then
+    SERVER_URL=${SERVER_URL:-"lp:ocb-server${VERSION}"}
+    ADDONS_URL=${ADDONS_URL:-"lp:ocb-addons${VERSION}"}
+    WEB_URL=${WEB_URL:-"lp:ocb-web${VERSION}"}
+  fi
+
+  # otherwise use upstream
+  SERVER_URL=${SERVER_URL:-"lp:openobject-server${VERSION}"}
+  ADDONS_URL=${ADDONS_URL:-"lp:openobject-addons${VERSION}"}
+  WEB_URL=${WEB_URL:-"lp:openerp-web${VERSION}"}
+
+  juju-log "Server URL is '${SERVER_URL}'"
+  juju-log "Addons URL is '${ADDONS_URL}'"
+  juju-log "Web frontend URL is '${WEB_URL}'"
+}
+
+resolve_current_urls() {
+  CURRENT_SERVER_URL=""
+  CURRENT_ADDONS_URL=""
+  CURRENT_WEB_URL=""
+
+  if [[ -d /srv/openobject-server ]]; then
+    cd /srv/openobject-server/
+    CURRENT_SERVER_URL=$(< .url) || true
+    CURRENT_ADDONS_URL=$(< addons/.url) || true
+    CURRENT_WEB_URL=$(< web/.url) || true
+  fi
+}
+
+bzr_checkout() {
+  local URL DIR
+  URL="$1"
+  # by default the directory is the last part of url path
+  DIR=$( IFS=/ SPLIT=( $URL ); echo "${SPLIT[-1]}" )
+  DIR="${2:-"$DIR"}"
+
+  bzr checkout --lightweight "${URL}" "${DIR}"
+  echo "${URL}" >"${DIR}/.url"
+}

=== added file 'hooks/tools/common'
--- hooks/tools/common	1970-01-01 00:00:00 +0000
+++ hooks/tools/common	2014-07-01 15:19:11 +0000
@@ -0,0 +1,52 @@
+#!/bin/bash
+# vim: et ai ts=2 sw=2:
+
+is_config_valid() {
+  [[ -n $(config-get admin_passwd) ]]
+}
+
+is_launchpad() {
+  [[ $(config-get origin) =~ lp* ]]
+}
+
+is_packaged() {
+  ! is_launchpad
+}
+
+is_package_installed() {
+  [[ -n $(dpkg --get-selections openerp-server 2>/dev/null) ]]
+}
+
+add_user() {
+  local USERNAME=${1:-openerp}
+
+  juju-log "Adding user $USERNAME"
+
+  # OpenERP package removes the user in post-remove
+  if ! getent passwd $USERNAME >/dev/null; then
+    adduser --quiet --disabled-password \
+            --gecos "OpenERP User" \
+            $USERNAME
+  fi
+}
+
+install_packages() {
+  if [[ -z $UPDATES_RUN ]]; then
+    apt-get -y update
+    UPDATES_RUN=yes
+  fi
+
+  apt-get install -y --no-install-recommends "$@"
+}
+
+generate_config() {
+  [[ -e /etc/openerp_db.conf ]] || return 0
+
+  cat - /etc/openerp_db.conf >/etc/openerp-server.conf <<EOF
+[options]
+admin_passwd = $(config-get admin_passwd)
+EOF
+
+  chown openerp: /etc/openerp-server.conf
+  chmod 640 /etc/openerp-server.conf
+}

=== added file 'icon.svg'
--- icon.svg	1970-01-01 00:00:00 +0000
+++ icon.svg	2014-07-01 15:19:11 +0000
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Background"
+       id="linearGradient6461"
+       gradientUnits="userSpaceOnUse"
+       x1="142.50002"
+       y1="973.29779"
+       x2="1.5e-05"
+       y2="973.29779"
+       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#bcbcbc;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.17"
+     inkscape:cx="-25.412417"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1041"
+     inkscape:window-x="0"
+     inkscape:window-y="17"
+     inkscape:window-maximized="1"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <text
+       xml:space="preserve"
+       style="font-size:84px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#800000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+       x="-253.71799"
+       y="713.83649"
+       id="text3839"
+       sodipodi:linespacing="125%"
+       inkscape:transform-center-y="4.422863"><tspan
+         sodipodi:role="line"
+         id="tspan3841"
+         x="-253.71799"
+         y="713.83649">O</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-05-23 16:48:38 +0000
+++ metadata.yaml	2014-07-01 15:19:11 +0000
@@ -10,6 +10,8 @@
   GUI, customizable reports, and NET-RPC and XML-RPC interfaces.  This
   package contains the Open ERP server, install openerp-client package
   for the client.
+categories:
+  - app-servers
 provides:
   website:
     interface: http

=== modified file 'revision'
--- revision	2012-03-16 18:44:49 +0000
+++ revision	2014-07-01 15:19:11 +0000
@@ -1,1 +1,1 @@
-1
+2

=== added directory 'tests'
=== added file 'tests/00test.sh'
--- tests/00test.sh	1970-01-01 00:00:00 +0000
+++ tests/00test.sh	2014-07-01 15:19:11 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sudo apt-add-repository ppa:juju/stable -y
+sudo apt-get update
+
+sudo apt-get install -y amulet

=== added file 'tests/deploy.test'
--- tests/deploy.test	1970-01-01 00:00:00 +0000
+++ tests/deploy.test	2014-07-01 15:19:11 +0000
@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+import amulet
+from time import sleep
+import requests
+import configparser
+
+seconds = 1800
+
+d = amulet.Deployment()
+
+d.add('postgresql')
+d.add('openerp-server')
+d.configure('openerp-server', {'admin_passwd': 'password'})
+d.relate('openerp-server:db', 'postgresql:db-admin')
+d.expose('openerp-server')
+
+try:
+  d.setup(seconds)
+  #pings every deployed unit
+  d.sentry.wait(seconds)
+except amulet.helpers.TimeoutError:
+  message = 'The environment did not setup in %d seconds.' % seconds
+  amulet.raise_status(amulet.SKIP, msg=message)
+
+oerp_unit = d.sentry.unit['openerp-server/0']
+psql_unit = d.sentry.unit['postgresql/0']
+
+db_relation = d.sentry.unit['postgresql/0'].relation('db-admin', 'openerp-server:db')
+
+conf = configparser.RawConfigParser()
+conf.read_string((oerp_unit.file_contents('/etc/openerp-server.conf')))
+
+assert(conf['options']['admin_passwd'] == 'password')
+
+for attempt in range(100):
+    try:
+        response = requests.get("http://%s:8069/?db=a" % oerp_unit.info['public-address'])
+        if response.text.lower().find("openerp") > 0:
+            break
+    except requests.ConnectionError:
+        sleep(6)
+else:
+    amulet.raise_status(amulet.FAIL, msg="OpenERP has not started up in time")
+
+#wget --tries=100 --timeout=6 "http://$host:8069/" -O - -a "$datadir/wget.log" | grep -q 'OpenERP'