Merge git configuration on master

[odoo/odoo.git] / openerp-wsgi.py

diff --git a/openerp-wsgi.py b/openerp-wsgi.py
index 9ae18ff..1ad46a1 100644 (file)
--- a/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@ -1,24 +1,27 @@
-#!/usr/bin/python
-# WSGI Handler sample configuration file.
-#
-# Change the appropriate settings below, in order to provide the parameters
-# that would normally be passed in the command-line.
-# (at least conf['addons_path'])
-#
-# For generic wsgi handlers a global application is defined.
-# For uwsgi this should work:
-#   $ uwsgi_python --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py
-#
-# For gunicorn additional globals need to be defined in the Gunicorn section.
-# Then the following command should run:
-#   $ gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py
+# -*- coding: utf-8 -*-
+
+"""
+WSGI Handler sample configuration file.
+=======================================
+
+Change the appropriate settings below, in order to provide the parameters
+that would normally be passed in the command-line.
+
+* For uwsgi this should work:
+
+    $ uwsgi_python --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py
+
+For gunicorn additional globals need to be defined in the Gunicorn section.
+
+    $ gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py
+"""
 
 import openerp
 
 #----------------------------------------------------------
 # Common
 #----------------------------------------------------------
-openerp.multi_process = True # Nah!
+openerp.multi_process = True
 
 # Equivalent of --load command-line option
 openerp.conf.server_wide_modules = ['web']
@@ -27,10 +30,14 @@ conf = openerp.tools.config
 # Path to the OpenERP Addons repository (comma-separated for
 # multiple locations)
 
-conf['addons_path'] = '../../addons/trunk,../../web/trunk/addons'
+conf['addons_path'] = '/opt/odoo/addons,/opt/odoo/include/custom/8.0'
+
+#conf['admin_passwd'] = 'TrucSuperCompliquéEtVachementSecret'
 
 # Optional database config if not using local socket
-#conf['db_name'] = 'mycompany'
+#conf['db_name'] = 'TODO'
+#conf['dbfilter'] = 'TODO'
+#conf['list_db'] = 'TODO'
 #conf['db_host'] = 'localhost'
 #conf['db_user'] = 'foo'
 #conf['db_port'] = 5432
@@ -41,14 +48,16 @@ conf['addons_path'] = '../../addons/trunk,../../web/trunk/addons'
 #----------------------------------------------------------
 application = openerp.service.wsgi_server.application
 
+openerp.service.server.load_server_wide_modules()
+
 #----------------------------------------------------------
 # Gunicorn
 #----------------------------------------------------------
 # Standard OpenERP XML-RPC port is 8069
-bind = '127.0.0.1:8069'
-pidfile = '.gunicorn.pid'
-workers = 4
-timeout = 240
-max_requests = 2000
+#bind = '127.0.0.1:8069'
+#pidfile = '.gunicorn.pid'
+#workers = 4
+#timeout = 240
+#max_requests = 2000
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: