Static httpd: by default, disable. Sample config.

bzr revid: p_christ@hol.gr-20100726093335-m6kfvk8xn2c6ddrh

diff --git a/bin/service/http_server.py b/bin/service/http_server.py
index e06fb34..2dfcf90 100644 (file)
--- a/bin/service/http_server.py
+++ b/bin/service/http_server.py
@@ -279,7 +279,7 @@ class StaticHTTPHandler(HttpLogHandler, HTTPHandler):
     def __init__(self,request, client_address, server):
         HTTPHandler.__init__(self,request,client_address,server)
         dir_path = tools.config.get_misc('static-http', 'dir_path', False)
-        assert dir_path
+        assert dir_path, "Please specify static-http/dir_path in config, or disable static-httpd!"
         self.__basepath = dir_path
 
     def translate_path(self, path):
@@ -303,7 +303,7 @@ class StaticHTTPHandler(HttpLogHandler, HTTPHandler):
         return path
 
 def init_static_http():
-    if not tools.config.get_misc('static-http','enable', True):
+    if not tools.config.get_misc('static-http','enable', False):
         return
     
     dir_path = tools.config.get_misc('static-http', 'dir_path', False)

diff --git a/doc/openerp-server.conf b/doc/openerp-server.conf
index 3b58a00..ac15f2e 100644 (file)
--- a/doc/openerp-server.conf
+++ b/doc/openerp-server.conf
@@ -25,3 +25,7 @@ translate_modules = ['all']
 demo = {}
 addons_path = None
 reportgz = False
+
+[static-http]
+enable = False
+dir_path = /var/www/html
\ No newline at end of file