Merge baryon.com.ar:workspace/pymin

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index db3151b2f93a4125e33cacd519736e817a33a5a4..b4c454d3bad9dcb52a3488eb7089b5e516686042 100644 (file)
--- a/config.py
+++ b/config.py
@@ -43,13 +43,17 @@ class Root(Handler):
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),

-        config_dir = '/etc/squid')
+        config_dir = join(config_path, 'proxy'))

 
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
         config_dir = join(config_path, 'vrrp'),
         pid_dir    = '/var/run')
 
 
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
         config_dir = join(config_path, 'vrrp'),
         pid_dir    = '/var/run')
 

+    qos = QoSHandler(
+       pickle_dir = join(pickle_path, 'qos'),
+       config_dir = join(config_path, 'qos'))
+

 bind_addr = \
 (
     '',   # Bind IP ('' is ANY)
 bind_addr = \
 (
     '',   # Bind IP ('' is ANY)