Fixes, VPN handler added and qos handler commented till it's fixed.

diff --git a/config.py b/config.py
index b4c454d3bad9dcb52a3488eb7089b5e516686042..8cc2dcf8f37b77494f27c1c38131a4d83d5e0198 100644 (file)
--- a/config.py
+++ b/config.py
@@ -43,16 +43,19 @@ class Root(Handler):
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
-        config_dir = join(config_path, 'proxy'))
+        config_dir = '/etc/squid')
 
     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'))
+    
+    vpn = VpnHandler(
+        pickle_dir = join(pickle_path, 'vpn'),
+        config_dir = '/etc/tinc')
+    #qos = QoSHandler(
+    #  pickle_dir = join(pickle_path, 'qos'),
+    #  config_dir = join(config_path, 'qos'))
 
 bind_addr = \
 (