Merge lp:~patrick-hetu/charms/oneiric/openerp-web/trunk into lp:charms/openerp-web

[Patrick Hetu]

add myself as maintainer

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Hi Patrick:

Thanks for the changes ... BTW .. there were a few changes to this charm beyond just adding yourself as the maintainer.

They all seem to work fine so, I am approving this.

In the future, it helps if there is a bit more information on the changes made.

thanks,

Juan

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2012-03-28 19:41:55 +0000
+++ config.yaml	2012-07-26 18:19:19 +0000
@@ -6,15 +6,20 @@
         This is the location to download OpenERP. It can be the keyword: distro
         or lp. With lp you can set a version number. Note that the distro keyword
         will not work on a Precise release of Ubuntu and if the multiverse repository
-        are not available.
+        are not available. Note the this configuration is only valid at installation
+        time and cannot be changed afterwards.
     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.
+        version number. Note the this configuration is only valid at installation
+        time and cannot be changed afterwards.
     db_filter:
       type: string
       default: ".*"
-      description: The regex that filter listed databases on the login page.
+      description: |
+        The regex that filter listed databases on the login page. Note the this
+        configuration is only valid at installation time and cannot be changed
+        afterwards.

=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2012-07-26 18:19:19 +0000
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -eu # -x for verbose logging to juju debug-log
+
+ORIGIN=$(config-get origin)
+VERSION=$(config-get version)
+
+if [[ $ORIGIN == lp ]]; then
+
+    apt-get -y update
+    apt-get install -y python-werkzeug python-simplejson python-tz \
+    python-dateutil python-babel --no-install-recommends
+
+    cd /srv/
+
+    if [[ ! -d openerp-web ]]; then
+      bzr checkout --lightweight lp:openerp-web${VERSION} openerp-web
+    fi
+
+else
+
+    apt-get -y update
+    apt-get install -y openerp-web apache2 --no-install-recommends
+
+fi
+
+if [[ -e /etc/init/openerp-web.conf ]]; then
+    # installed: change the existing configuration
+    if [[ $ORIGIN == lp ]]; then
+      sed -i -e 's|--db-filter=".*"|--db-filter="${DB_FILTER}|' /etc/init/openerp-web.conf
+    else
+
+    fi
+fi

=== modified file 'hooks/openerp-relation-joined'
--- hooks/openerp-relation-joined	2012-03-28 19:40:57 +0000
+++ hooks/openerp-relation-joined	2012-07-26 18:19:19 +0000
@@ -30,8 +30,6 @@
 exec su -c "./openerp-web --proxy-mode --db-filter="${DB_FILTER}" --addons-path=addons --server-host ${REMOTE_PRIVATE_ADDRESS}" openerp
 EOF
 
-  start openerp-web || restart openerp-web
-
   open-port 8002/tcp
 
 else
@@ -97,7 +95,7 @@
                                                                 
 EOF
 
-  service openerp-web start || service openerp-web restart
   open-port 80/tcp
 fi
 
+service openerp-web start || service openerp-web restart

=== modified file 'hooks/start'
--- hooks/start	2012-03-20 18:40:08 +0000
+++ hooks/start	2012-07-26 18:19:19 +0000
@@ -4,8 +4,4 @@
 
 ORIGIN=$(config-get origin)
 
-if [[ $ORIGIN == lp ]]; then
-  start openerp-web  || true
-else
-  service openerp-web start || true
-fi
+service openerp-web start || true

=== modified file 'hooks/stop'
--- hooks/stop	2012-03-20 17:17:57 +0000
+++ hooks/stop	2012-07-26 18:19:19 +0000
@@ -4,9 +4,5 @@
 
 ORIGIN=$(config-get origin)
 
-if [[ $ORIGIN == lp ]]; then
-  stop openerp-web
-else
-  service openerp-web stop
-fi
+service openerp-web stop
 

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-03-16 18:43:36 +0000
+++ metadata.yaml	2012-07-26 18:19:19 +0000
@@ -1,5 +1,6 @@
 name: openerp-web
 summary: Enterprise Resource Management (server)
+maintainer: Patrick Hetu <[e-mail]>
 description: |
   Open ERP, previously known as TinyERP, is a complete ERP and CRM. The
   main features are accounting (analytic and financial), stock