[tryton-debian-vcs] tryton-server branch debian-jessie-3.4 updated. debian/3.4.6-1-1-ge988b74

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.4.6-1-1-ge988b74

commit e988b7419ce20d8449d4bfc2b5cbb39dce6b686e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Apr 27 17:06:55 2015 +0200

    Running internal cron of trytond by default.
    
    The automatical start of the internal cron was removed, because only one
    trytond should run the cron per database. This is usually the case, so
    we provide the old behavior.
    
    cherry-pick from ee03f2016cfe050b432175feed4a49487f17a080
    The described behavior applies to version 3.4, too. Thanks to Vincent
    Bastos for pointing this out.

diff --git a/debian/tryton-server.default b/debian/tryton-server.default
index 5e4f327..1ed770c 100644
--- a/debian/tryton-server.default
+++ b/debian/tryton-server.default
@@ -19,4 +19,4 @@ LOGCONF="/etc/tryton/trytond_log.conf"
 
 # Additional options that are passed to the Daemon.
 # i.e. to increase the verbosity of the server log add -v
-DAEMON_OPTS=" --config ${CONFIGFILE} --logconf ${LOGCONF}"
+DAEMON_OPTS=" --config ${CONFIGFILE} --logconf ${LOGCONF} --cron"
diff --git a/debian/tryton-server.service b/debian/tryton-server.service
index e9ce0c0..d803fd7 100644
--- a/debian/tryton-server.service
+++ b/debian/tryton-server.service
@@ -9,7 +9,7 @@ ConditionPathExists=/etc/tryton/trytond.conf
 [Service]
 User=tryton
 Group=tryton
-ExecStart=/usr/bin/trytond --config /etc/tryton/trytond.conf --logconf /etc/tryton/trytond_log.conf
+ExecStart=/usr/bin/trytond --config /etc/tryton/trytond.conf --logconf /etc/tryton/trytond_log.conf --cron
 Restart=on-failure
 
 [Install]
-- 
tryton-server