Skip to content

Commit

Permalink
PR review
Browse files Browse the repository at this point in the history
  • Loading branch information
lasley committed Aug 10, 2017
1 parent 20f01c4 commit 5ba8e73
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ ONBUILD ARG PGUSER=odoo
ONBUILD ARG PGPASSWORD=odoopassword
ONBUILD ARG PGHOST=db
ONBUILD ARG PGDATABASE=prod
ONBUILD ARG ODOO_MAX_CRON_THREADS=-1
ONBUILD ARG ODOO_MAX_CRON_THREADS=2
ONBUILD ARG ODOO_WORKERS=0
ONBUILD ARG ODOO_LIMIT_TIME_REAL=120
ONBUILD ARG ODOO_LIMIT_TIME_CPU=60
ONBUILD ARG ODOO_LIMIT_MEMORY_HARD=805306368
ONBUILD ARG ODOO_LIMIT_MEMORY_SOFT=671088640
ONBUILD ARG ODOO_LIMIT_REQUEST=8192
ONBUILD ARG ODOO_LIMIT_TIME_REAL_CRON=1
ONBUILD ARG ODOO_DB_FILTER=
ONBUILD ARG ODOO_LIMIT_TIME_REAL_CRON=-1
ONBUILD ARG ODOO_DB_FILTER=""
ONBUILD ARG ODOO_LIST_DB=1
ONBUILD ARG ODOO_LOG_LEVEL=info
# Config variables
Expand Down
1 change: 0 additions & 1 deletion conf.d/00-base.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[options]
; Configuration file template that will be expanded on build
admin_passwd = $ADMIN_PASSWORD
data_dir = /var/lib/odoo
unaccent = $UNACCENT
16 changes: 8 additions & 8 deletions conf.d/60-performance.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[options]
max_cron_threads=$ODOO_MAX_CRON_THREADS
workers=$ODOO_WORKERS
limit_time_real=$ODOO_LIMIT_TIME_REAL
limit_time_cpu=$ODOO_LIMIT_TIME_CPU
limit_memory_hard=$ODOO_LIMIT_MEMORY_HARD
limit_memory_soft=$ODOO_LIMIT_MEMORY_SOFT
limit_request=$ODOO_LIMIT_REQUEST
limit_time_real_cron=$ODOO_LIMIT_TIME_REAL_CRON
max_cron_threads = $ODOO_MAX_CRON_THREADS
workers = $ODOO_WORKERS
limit_time_real = $ODOO_LIMIT_TIME_REAL
limit_time_cpu = $ODOO_LIMIT_TIME_CPU
limit_memory_hard = $ODOO_LIMIT_MEMORY_HARD
limit_memory_soft = $ODOO_LIMIT_MEMORY_SOFT
limit_request = $ODOO_LIMIT_REQUEST
limit_time_real_cron = $ODOO_LIMIT_TIME_REAL_CRON
5 changes: 3 additions & 2 deletions conf.d/70-security.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[options]
dbfilter=$ODOO_DB_FILTER
list_db=$ODOO_LIST_DB
admin_passwd = $ADMIN_PASSWORD
dbfilter = $ODOO_DB_FILTER
list_db = $ODOO_LIST_DB
2 changes: 1 addition & 1 deletion conf.d/80-logging.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[options]
log_level=$ODOO_LOG_LEVEL
log_level = $ODOO_LOG_LEVEL

0 comments on commit 5ba8e73

Please sign in to comment.