qos implementation fixes

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index bf2a0e64b5b4154d87e781d7fa857e6645e04de4..57d0f5a2586b92ca42a14b6c2109d5e8d8df6182 100644 (file)
--- a/config.py
+++ b/config.py
@@ -10,27 +10,34 @@ pickle_path = join(base_path, 'pickle')
 config_path = join(base_path, 'config')
 
 class Root(Handler):
-    dhcp = DhcpHandler(
-        pickle_dir = join(pickle_path, 'dhcp'),
-        config_dir = join(config_path, 'dhcp'))
-    dns = DnsHandler(
-        pickle_dir = join(pickle_path, 'dns'),
-        config_dir = join(config_path, 'dns'))
-    firewall = FirewallHandler(
-        pickle_dir = join(pickle_path, 'firewall'),
-        config_dir = join(config_path, 'firewall'))
     ip = IpHandler(
         pickle_dir = join(pickle_path, 'ip'),
         config_dir = join(config_path, 'ip'))
-    proxy = ProxyHandler(
-        pickle_dir = join(pickle_path, 'proxy'),
-        config_dir = join(config_path, 'proxy'))
-    vrrp = VrrpHandler(
-        pickle_dir = join(pickle_path, 'vrrp'),
-        config_dir = join(config_path, 'vrrp'))
+    firewall = FirewallHandler(
+        pickle_dir = join(pickle_path, 'firewall'),
+        config_dir = join(config_path, 'firewall'))
+    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
+    dns = DnsHandler(
+        pickle_dir = join(pickle_path, 'dns'),
+        config_dir = {
+            'named.conf': join(config_path, 'dns'),
+            'zoneX.zone': join(config_path, 'dns', 'zones'),
+        })
+    dhcp = DhcpHandler(
+        pickle_dir = join(pickle_path, 'dhcp'),
+        config_dir = join(config_path, 'dhcp'))
     ppp = PppHandler(
         pickle_dir = join(pickle_path, 'ppp'),
         config_dir = join(config_path, 'ppp'))
+    vrrp = VrrpHandler(
+        pickle_dir = join(pickle_path, 'vrrp'),
+        config_dir = join(config_path, 'vrrp'))
+    proxy = ProxyHandler(
+        pickle_dir = join(pickle_path, 'proxy'),
+        config_dir = join(config_path, 'proxy'))
+    qos = QoSHandler(
+       pickle_dir = join(pickle_path, 'qos'),
+       config_dir = join(config_path, 'qos'))
 
 bind_addr = \
 (