diff options
| author | Antony Lesuisse <al@openerp.com> | 2013-03-21 00:18:28 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2013-03-21 00:18:28 +0100 |
| commit | 2a096910e8d2c1257a70793ec2d60fd43851fab5 (patch) | |
| tree | 06a92a820fd0d6973ccb189d2c159f3c0bdda5b4 /debian | |
| parent | 232840179cb6776445726695602b627ea22d00ab (diff) | |
[FIX] debian logfile rotation and init cleanup, courtesy of Hiren
bzr revid: al@openerp.com-20130320231828-hhw7o17ahvl0cv7b
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/openerp.init | 73 | ||||
| -rw-r--r-- | debian/openerp.postinst | 6 |
2 files changed, 35 insertions, 44 deletions
diff --git a/debian/openerp.init b/debian/openerp.init index 6abb6f10ed6..98e653298b2 100644 --- a/debian/openerp.init +++ b/debian/openerp.init @@ -17,55 +17,46 @@ DAEMON=/usr/bin/openerp-server NAME=openerp-server DESC=openerp-server CONFIG=/etc/openerp/openerp-server.conf -LOGFILE=/var/log/openerp-server.log +LOGFILE=/var/log/openerp/openerp-server.log USER=openerp test -x ${DAEMON} || exit 0 set -e -case "${1}" in - start) - echo -n "Starting ${DESC}: " - - start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \ - --chuid ${USER} --background --make-pidfile \ - --exec ${DAEMON} -- --config=${CONFIG} \ - --logfile=${LOGFILE} - - echo "${NAME}." - ;; - - stop) - echo -n "Stopping ${DESC}: " - - start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid \ - --oknodo - - echo "${NAME}." - ;; +do_start () { + echo -n "Starting ${DESC}: " + start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid --chuid ${USER} --background --make-pidfile --exec ${DAEMON} -- --config=${CONFIG} --logfile=${LOGFILE} + echo "${NAME}." +} - restart|force-reload) - echo -n "Restarting ${DESC}: " +do_stop () { + echo -n "Stopping ${DESC}: " + start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid --oknodo + echo "${NAME}." +} - start-stop-daemon --stop --quiet --pidfile /var/run/${NAME}.pid \ - --oknodo - - sleep 1 - - start-stop-daemon --start --quiet --pidfile /var/run/${NAME}.pid \ - --chuid ${USER} --background --make-pidfile \ - --exec ${DAEMON} -- --config=${CONFIG} \ - --logfile=${LOGFILE} - - echo "${NAME}." - ;; - - *) - N=/etc/init.d/${NAME} - echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2 - exit 1 - ;; +case "${1}" in + start) + do_start + ;; + + stop) + do_stop + ;; + + restart|force-reload) + echo -n "Restarting ${DESC}: " + do_stop + sleep 1 + do_start + ;; + + *) + N=/etc/init.d/${NAME} + echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2 + exit 1 + ;; esac exit 0 diff --git a/debian/openerp.postinst b/debian/openerp.postinst index 8700a259198..2eccd5111ec 100644 --- a/debian/openerp.postinst +++ b/debian/openerp.postinst @@ -12,9 +12,9 @@ case "${1}" in chown openerp:openerp /etc/openerp/openerp-server.conf chmod 0640 /etc/openerp/openerp-server.conf # Creating log file - touch /var/log/openerp-server.log - chown openerp:openerp /var/log/openerp-server.log - chmod 0640 /var/log/openerp-server.log + mkdir -p /var/log/openerp/ + chown openerp:openerp /var/log/openerp + chmod 0750 /var/log/openerp # Creating local storage directory mkdir -p /var/lib/openerp/filestore chown openerp:openerp -R /var/lib/openerp |