[MERGE] merge with latest stable

[odoo/odoo.git] / doc / openerp-server.conf

diff --git a/doc/openerp-server.conf b/doc/openerp-server.conf
index bdc90a8..4f13c8a 100644 (file)
--- a/doc/openerp-server.conf
+++ b/doc/openerp-server.conf
@@ -1,24 +1,34 @@
 [options]
 without_demo = True
+; This is the password that allows database operations:
+; admin_passwd = admin
 upgrade = False
 verbose = False
+netrpc = True
+; netrpc_interface = 
+; netrpc_port = 
 xmlrpc = True
-db_user = False
+; xmlrpc_interface = 
+xmlrpc_port = 8069
+db_host = False
+db_port = False
+; Please uncomment the following line *after* you have created the
+; database. It activates the auto module check on startup.
+; db_name = terp
+db_user = openerp
 db_password = False
 ; Uncomment these for xml-rpc over SSL
 ; secure = True
-; sslcert = /etc/openerp/server.cert
-; sslkey = /etc/openerp/server.key
+; secure_cert_file = /etc/openerp/server.cert
+; secure_pkey_file = /etc/openerp/server.key
 root_path = None
 soap = False
 translate_modules = ['all']
-db_name = terp
-netrpc = True
 demo = {}
-interface = 
-db_host = False
-db_port = False
-port = 8069
 addons_path = None
 reportgz = False
 
+; Static http parameters
+static_http_enable = False
+static_http_document_root = /var/www/html
+static_http_url_prefix = /
\ No newline at end of file