Merge lp:~openerp-dev/openobject-server/6.0-bug-750267-xrg into lp:openobject-server/6.0

[xrg]

[Vo Minh Thu (thu)]

I'm happy to know that this script should be autonomous... can we also know what is its purpose and why we would want to add it to the server's repo?

[Vo Minh Thu (thu)]

You're script is a wrapper for 'createuser'. So instead of expecting the user to know the arguments for 'createuser', she should know the arguments for your script, which are not documented.

The only possibly valuable part of it is that it reads some default parameter from the openerp config file.

Still, I would much prefer some documentation about installing openerp using 'createuser' than some documentation to describe a fragile wrapper.

review: Disapprove

Unmerged revisions

3395. By xrg on 2011-04-04

bin: non-scripts must be -x, scripts +x

This should solve the corresponding rpmlint errors. Python files with a
shebang must be executable. Non-standalone python shall not have a shebang.
(cherry picked from commit d44bd2dcc03a75864cae7c93020537ac573999fe)

3394. By xrg on 2011-04-04

readme: convert to unix line terminators
(cherry picked from commit a7f39a511daf67fe6c6acaa8d678e8c8f4ee6e2f)

3393. By xrg on 2011-04-04

server-check.sh: when doing the 'su' trick, reset the trigger file
(cherry picked from commit 0e9cafa01cd5e658dd99c0b0702ffd450f7c86a3)

3392. By xrg on 2011-04-04

tools/server-check: support distros with postgres ident authentication

In such distros, we have to run once as root, and once as the postgres
user, which can access the db, not any other file.
(cherry picked from commit e4957f45384b33e5cc7891c4f34de5dc4022d943)

3391. By xrg on 2011-04-04

tools/server-check: allow createdb

From the origin of this script[1], the new user created didn't have
permission to create dbs, which is required in OpenERP.

[1] a2billing, v200
(cherry picked from commit 24cd824c0ae37180882736ecfe379747624fcf2d)

3390. By xrg on 2011-04-04

Tools: a script to check pg connectivity for a server installation

To be used in init scripts or package installations.
(cherry picked from commit e489748150371e3b620d53ffa20196d2ed1a2d0f)

3389. By xrg on 2011-04-04

server-init: simplify syntax for RedHat
(cherry picked from commit 787ad03c0edf15f8dea1f1cff8829676d318ce90)

=== modified file 'README'
--- README	2010-09-28 18:53:49 +0000
+++ README	2011-04-04 13:34:16 +0000
@@ -1,17 +1,17 @@
-About OpenERP
----------------
-
-OpenERP is a free Enterprise Resource Planning and Customer Relationship 
-Management software. It is mainly developed to meet changing needs.
-
-The main functional features are: CRM & SRM, analytic and financial accounting,
-double-entry stock management, sales and purchases management, tasks automation,
-help desk, marketing campaign, ... and vertical modules for very specific 
-businesses.
-
-Technical features include a distributed server, flexible workflows, an object 
-database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...
-
-For more information, please visit: 
-http://www.openerp.com
-
+About OpenERP
+---------------
+
+OpenERP is a free Enterprise Resource Planning and Customer Relationship 
+Management software. It is mainly developed to meet changing needs.
+
+The main functional features are: CRM & SRM, analytic and financial accounting,
+double-entry stock management, sales and purchases management, tasks automation,
+help desk, marketing campaign, ... and vertical modules for very specific 
+businesses.
+
+Technical features include a distributed server, flexible workflows, an object 
+database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ...
+
+For more information, please visit: 
+http://www.openerp.com
+

=== modified file 'bin/release.py'
--- bin/release.py	2011-04-01 14:25:28 +0000
+++ bin/release.py	2011-04-04 13:34:16 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #

=== modified file 'bin/tools/graph.py' (properties changed: -x to +x)
=== modified file 'bin/tools/which.py' (properties changed: -x to +x)
=== modified file 'doc/openerp-server.init'
--- doc/openerp-server.init	2009-10-23 22:29:25 +0000
+++ doc/openerp-server.init	2011-04-04 13:34:16 +0000
@@ -52,7 +52,7 @@
 start() {
     if [ -d /etc/openerp/start.d ] ; then
         echo -n $"Preparing $desc: "
-        run-parts --exit-on-error /etc/openerp/start.d
+        run-parts /etc/openerp/start.d
         RETVAL=$?
         echo
         [ $RETVAL -ne 0 ] && return $RETVAL

=== added file 'tools/server-check.sh'
--- tools/server-check.sh	1970-01-01 00:00:00 +0000
+++ tools/server-check.sh	2011-04-04 13:34:16 +0000
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# This script should be autonomous, not require any external
+# conf files. However, it will try to read the server's conf
+
+get_ini ()
+{
+    eval $( cat "$1" | grep  "^db_\(user\|password\|name\|host\|port\) *=" | \
+	sed 's/False//;s/\([^ ]*\) *= *\(.*\)$/\U\1\E=\2/' )
+}
+
+DEVEL_MODE=
+SUCMD=
+DB_HOST=
+DB_PORT=
+DB_USER=openerp
+DB_PASSWORD=
+IN_SU=
+
+PG_ROOT=postgres
+
+while [ -n "$1" ] ; do
+    case "$1" in
+    -d)
+	DEVEL_MODE=y
+	echo "Devel mode!"
+	;;
+    -s)
+	SUCMD="su $PG_ROOT - "
+	;;
+    -h)
+	DB_HOST=$2
+	shift 1
+	;;
+    -p)
+	DB_PORT=$2
+	shift 1
+	;;
+    -U)
+	DB_USER=$2
+	shift 1
+	;;
+    -W)
+	DB_PASSWORD=$2
+	shift 1
+	;;
+    --in-su)
+	IN_SU=y
+	;;
+    esac
+    shift 1
+done
+
+if [ ! -f "/var/run/openerp-server-check" ] && [ -z "$DEVEL_MODE" ] ; then
+    # only run this if the magic file is there
+    exit 0
+fi
+
+if [ -n "$DEVEL_MODE" ] && [ -r ~/openerp-server.conf ] ; then
+    echo "Parsing" ~/openerp-server.conf
+    get_ini ~/openerp-server.conf
+elif [ -f "/etc/openerp-server.conf" ] ; then
+    get_ini "/etc/openerp-server.conf"
+else
+    echo "No config file, using defaults"
+fi
+
+if [ -n "$DEVEL_MODE" ] ; then
+    echo "Using:"
+    echo "DB_HOST=" $DB_HOST
+    echo "DB_PORT=" $DB_PORT
+    echo "DB_USER=" $DB_USER
+fi
+
+DB_CONNS= 
+if [ -n "$DB_HOST" ] ; then
+    DB_CONNS+=" --host $DB_HOST"
+fi
+if [ -n "$DB_PORT" ] ; then
+    DB_CONNS+=" --port $DB_PORT"
+fi
+
+if [ -n "$SUCMD"  ] ; then
+    CMD="$0 --in-su"
+    if [ -n "$DB_HOST" ] ; then 
+	CMD="$CMD -h $DB_HOST"
+    fi
+    if [ -n "$DB_PORT" ] ; then
+	CMD="$CMD -p $DB_PORT"
+    fi
+    if [ -n "$DB_PASSWORD" ] ; then
+	CMD="$CMD -W $DB_PASSWORD"
+    fi
+    su $PG_ROOT -c "$CMD" || "$?"
+    
+    if [ -z "$DEVEL_MODE" ] ; then
+	rm -f "/var/run/openerp-server-check"
+    fi
+    exit 0
+fi
+
+if ! (psql -qt -U $PG_ROOT $DB_CONNS -c "SELECT usename FROM pg_user WHERE usename = '$DB_USER';" | \
+	grep $DB_USER > /dev/null) ; then
+	if ! $SUCMD createuser -U $PG_ROOT $DB_CONNS -S -d -R -l $DB_USER < /dev/null ; then
+		echo "Failed to create user $DB_USER"
+		exit 1
+	fi
+else
+	echo "User $DB_USER already exists."
+fi
+
+echo "OK"
+if [ -z "$DEVEL_MODE" ] && [ -z "$IN_SU" ] ; then
+    rm -f "/var/run/openerp-server-check"
+fi
+
+#eof