[Python-apps-commits] r8162 - in packages/openerp6/trunk (8 files)
xnox-guest at users.alioth.debian.org
xnox-guest at users.alioth.debian.org
Sat Feb 11 01:57:10 UTC 2012
Date: Saturday, February 11, 2012 @ 01:57:08
Author: xnox-guest
Revision: 8162
Updates
Added:
packages/openerp6/trunk/debian/local/openerp6-server
Modified:
packages/openerp6/trunk/debian/ (properties)
packages/openerp6/trunk/debian/local/server.conf.tpl
packages/openerp6/trunk/debian/openerp6-server.config
packages/openerp6/trunk/debian/openerp6-server.init
packages/openerp6/trunk/debian/openerp6-server.install
packages/openerp6/trunk/debian/openerp6-server.postinst
packages/openerp6/trunk/debian/openerp6-server.templates
Added: packages/openerp6/trunk/debian/local/openerp6-server
===================================================================
--- packages/openerp6/trunk/debian/local/openerp6-server (rev 0)
+++ packages/openerp6/trunk/debian/local/openerp6-server 2012-02-11 01:57:08 UTC (rev 8162)
@@ -0,0 +1,2 @@
+#!/bin/sh
+cd /usr/share/openerp6/server/ && python openerp-server.py $@
Property changes on: packages/openerp6/trunk/debian/local/openerp6-server
___________________________________________________________________
Added: svn:executable
+ *
Modified: packages/openerp6/trunk/debian/local/server.conf.tpl
===================================================================
--- packages/openerp6/trunk/debian/local/server.conf.tpl 2012-02-09 23:45:05 UTC (rev 8161)
+++ packages/openerp6/trunk/debian/local/server.conf.tpl 2012-02-11 01:57:08 UTC (rev 8162)
@@ -34,7 +34,7 @@
# 'debug', 'debug_rpc_answer', 'notset']; default = 20
log_level = info
# file where the server log will be stored; default = None
-logfile = /var/log/openerp6-server/openerp6-server.log
+logfile = /var/log/openerp6/openerp6-server.log
login_message = False
# do not rotate the logfile; default = True
logrotate = True
Modified: packages/openerp6/trunk/debian/openerp6-server.config
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.config 2012-02-09 23:45:05 UTC (rev 8161)
+++ packages/openerp6/trunk/debian/openerp6-server.config 2012-02-11 01:57:08 UTC (rev 8162)
@@ -9,6 +9,10 @@
db_subst openerp6-server/password VER 6.0
db_input high openerp6-server/password || true
db_go
+db_get openerp6-server/password
+if [ -z "${RET}" ]; then
+ db_set openerp6-server/password `env LANG=C LC_ALL=C tr -dc "[:alnum:]" < /dev/urandom | dd bs=1 count=12 2>/dev/null`
+fi
if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
. /usr/share/dbconfig-common/dpkg/config.pgsql
Modified: packages/openerp6/trunk/debian/openerp6-server.init
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.init 2012-02-09 23:45:05 UTC (rev 8161)
+++ packages/openerp6/trunk/debian/openerp6-server.init 2012-02-11 01:57:08 UTC (rev 8162)
@@ -12,19 +12,18 @@
# Description: Open ERP is a complete ERP and CRM software.
### END INIT INFO
-_NAME=openerp6
+USER=openerp6
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/$_NME-server
-NAME=$_NAME-server
+DAEMON=/usr/share/${USER}/server/openerp-server.py
+NAME=${USER}-server
-USER=$_NAME
-
if [ -d /run ]; then
- SOCKET=/run/${NAME}
+ PIDDIR=/run/${NAME}
else
- SOCKET=/var/run/${NAME}
+ PIDDIR=/var/run/${NAME}
fi
+PIDFILE=${PIDDIR}/${NAME}.pid
test -x ${DAEMON} || exit 0
@@ -34,24 +33,24 @@
do_start() {
# create socket directory
- if [ -d ${SOCKET} ]; then
- chmod 2775 ${SOCKET}
+ if [ -d ${PIDDIR} ]; then
+ chmod 2775 ${PIDDIR}
else
- install -d -m 2775 -o ${USER} -g ${USER} ${SOCKET}
+ install -d -m 2775 -o ${USER} -g ${USER} ${PIDDIR}
fi
-
- start-stop-daemon --start --quiet \
- --pidfile ${SOCKET}/${NAME}.pid \
- --chuid ${USER} --background --name python \
- --exec ${DAEMON} -- --config=/etc/${NAME}.conf
+ echo $DAEMON
+ start-stop-daemon --start --background --pidfile ${PIDFILE} --chuid ${USER} \
+ --startas ${DAEMON} -- --config=/etc/${NAME}.conf --pidfile ${PIDFILE}
}
do_stop() {
- start-stop-daemon --stop --quiet --retry 5 --name python \
- --pidfile ${SOCKET}/${NAME}.pid \
- --oknodo
+ start-stop-daemon --stop --quiet --retry 5 --name python --pidfile ${PIDFILE} --oknodo
}
+do_status() {
+ start-stop-daemon --status --quiet --pidfile ${PIDFILE} --user ${USER} --name python
+}
+
case "${1}" in
start)
log_begin_msg "Starting $NAME:"
@@ -65,6 +64,12 @@
log_end_msg $?
;;
+ status)
+ log_begin_msg "Status of $NAME:"
+ do_status
+ log_end_msg $?
+ ;;
+
restart|force-reload)
log_begin_msg "Restarting $NAME:"
if do_stop; then
@@ -75,7 +80,7 @@
*)
N=/etc/init.d/${NAME}
- echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2
+ echo "Usage: ${NAME} {start|stop|restart|force-reload|status}" >&2
exit 1
;;
esac
Modified: packages/openerp6/trunk/debian/openerp6-server.install
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.install 2012-02-09 23:45:05 UTC (rev 8161)
+++ packages/openerp6/trunk/debian/openerp6-server.install 2012-02-11 01:57:08 UTC (rev 8162)
@@ -1,3 +1,4 @@
debian/local/server.conf.tpl /usr/share/openerp6
bin /usr/share/openerp6
pixmaps /usr/share/openerp6/bin
+debian/local/openerp6-server /usr/bin/
Modified: packages/openerp6/trunk/debian/openerp6-server.postinst
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.postinst 2012-02-09 23:45:05 UTC (rev 8161)
+++ packages/openerp6/trunk/debian/openerp6-server.postinst 2012-02-11 01:57:08 UTC (rev 8162)
@@ -20,12 +20,7 @@
db_version 2.0
db_get openerp6-server/password
-if [ "${RET}" = ""]; then
- _PASSWORD="admin"
-else
- _PASSWORD="${RET}"
-fi
-sed -i -e "s/^admin_passwd.*$/admin_passwd = ${_PASSWORD}/" ${CONF}
+sed -i -e "s/^admin_passwd.*$/admin_passwd = ${RET}/" ${CONF}
chown -R ${USER}:${USER} ${CONF} /var/lib/openerp6 /var/log/openerp6
#DEBHELPER#
Modified: packages/openerp6/trunk/debian/openerp6-server.templates
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.templates 2012-02-09 23:45:05 UTC (rev 8161)
+++ packages/openerp6/trunk/debian/openerp6-server.templates 2012-02-11 01:57:08 UTC (rev 8162)
@@ -1,10 +1,8 @@
Template: openerp-server/password
Type: string
-Default: admin
-_Description: Superadmin password for Open ERP server v${VER}:
- This password is used by Open ERP to allow administration of Open ERP
- instances. Users need to know this password if they want to install and
- configure new Open ERP instance, take or restore a backup of an OpenERP
- instance.
- .
- This password is stored in the openerp-server config file.
+Default:
+_Description: Superadmin password for OpenERP server v${VER}:
+ Please provive superadmin password for OpenERP to manipulate
+ databases. If left blank, a random password will be generated. This
+ password is stored in the openerp-server config file. OpenERP asks for
+ this password to create, drop, backup and restore databases.
More information about the Python-apps-commits
mailing list