Merge baryon.com.ar:workspace/pymin

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index ee3c174cf3dd0eb6c02506e2c15c71c47f4e84d2..b4c454d3bad9dcb52a3488eb7089b5e516686042 100644 (file)
--- a/config.py
+++ b/config.py
@@ -10,17 +10,25 @@ pickle_path = join(base_path, 'pickle')
 config_path = join(base_path, 'config')
 
 class Root(Handler):
-    ip = IpHandler(
-        pickle_dir = join(pickle_path, 'ip'),
-        config_dir = join(config_path, 'ip'))
 
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         config_dir = '/tmp')
 
-    dhcp = DhcpHandler(
-        pickle_dir = join(pickle_path, 'dhcp'),
-        config_dir = '/etc')
+    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
+
+    ppp = PppHandler(
+        pickle_dir = join(pickle_path, 'ppp'),
+        config_dir = {
+            'pap-secrets':  '/etc/ppp',
+            'chap-secrets': '/etc/ppp',
+            'options.X':    '/etc/ppp',
+            'nameX':        '/etc/ppp/peers',
+        })
+
+    ip = IpHandler(
+        pickle_dir = join(pickle_path, 'ip'),
+        config_dir = join(config_path, 'ip'))
 
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
@@ -29,25 +37,22 @@ class Root(Handler):
             'zoneX.zone': '/var/lib/named',
         })
 
-    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
+    dhcp = DhcpHandler(
+        pickle_dir = join(pickle_path, 'dhcp'),
+        config_dir = '/etc')
 
     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')
 
-    ppp = PppHandler(
-        pickle_dir = join(pickle_path, 'ppp'),
-        config_dir = {
-            'pap-secrets':  '/etc/ppp',
-            'chap-secrets': '/etc/ppp',
-            'options.X':    '/etc/ppp',
-            'nameX':        '/etc/ppp/peers',
-        })
+    qos = QoSHandler(
+       pickle_dir = join(pickle_path, 'qos'),
+       config_dir = join(config_path, 'qos'))
 
 bind_addr = \
 (