diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-10-27 18:23:44 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-10-27 18:23:44 +0200 |
| commit | ea479ce6f3ffdcf36c5f918b6ce68888e42a56ce (patch) | |
| tree | addf64e3f038bf53c293cc7ba1e81fd0b9413b32 /setup | |
| parent | 68b1c5c1fa643e99fd5e597949c39e222477dcab (diff) | |
| parent | 3bb022d57c43c51a5fd4be39e4123b1206db4782 (diff) | |
[MERGE] forward port branch 10.0 up to 3bb022d
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/package.dfdebian | 2 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/setup/package.dfdebian b/setup/package.dfdebian index 8ad98e7aba0..4c6e417dfa9 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -21,6 +21,7 @@ RUN apt-get update -qq && \ postgresql \ postgresql-client \ python \ + python-babel \ python-dateutil \ python-decorator \ python-docutils \ @@ -36,7 +37,6 @@ RUN apt-get update -qq && \ python-passlib \ python-psutil \ python-psycopg2 \ - python-pybabel \ python-pychart \ python-pydot \ python-pyparsing \ diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index cfc4f754233..94a225db9f4 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -7,6 +7,7 @@ ODOO_CONFIGURATION_FILE=$ODOO_CONFIGURATION_DIR/odoo.conf ODOO_DATA_DIR=/var/lib/odoo ODOO_GROUP="odoo" ODOO_LOG_DIR=/var/log/odoo +ODOO_LOG_FILE=$ODOO_LOG_DIR/odoo-server.log ODOO_USER="odoo" if ! getent passwd | grep -q "^odoo:"; then @@ -43,7 +44,7 @@ chown $ODOO_USER:$ODOO_GROUP $ODOO_DATA_DIR INIT_FILE=/lib/systemd/system/odoo.service touch $INIT_FILE chmod 0700 $INIT_FILE -cat << 'EOF' > $INIT_FILE +cat << EOF > $INIT_FILE [Unit] Description=Odoo Open Source ERP and CRM After=network.target @@ -52,7 +53,7 @@ After=network.target Type=simple User=odoo Group=odoo -ExecStart=/usr/bin/odoo --config=/etc/odoo/odoo.conf +ExecStart=/usr/bin/odoo --config $ODOO_CONFIGURATION_FILE --logfile $ODOO_LOG_FILE [Install] WantedBy=multi-user.target |