Merge or3st3s@azazel:/home/luca/repos/pymin

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index ca0cc650e5bed824baa70fa742df40feba129999..c6a50ed0a74028433a1ab90cb706656423fb3a3d 100644 (file)
--- a/config.py
+++ b/config.py
@@ -15,7 +15,10 @@ class Root(Handler):
         config_dir = join(config_path, 'dhcp'))
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
         config_dir = join(config_path, 'dhcp'))
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),

-        config_dir = join(config_path, 'dns'))
+        config_dir = {
+            'named.conf': join(config_path, 'dns'),
+            'zoneX.zone': join(config_path, 'dns', 'zones'),
+        })

     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         config_dir = join(config_path, 'firewall'))
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         config_dir = join(config_path, 'firewall'))


@@ -25,6 +28,12 @@ class Root(Handler):
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
         config_dir = join(config_path, 'proxy'))
     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'))
+    ppp = PppHandler(
+        pickle_dir = join(pickle_path, 'ppp'),
+        config_dir = join(config_path, 'ppp'))

 
 bind_addr = \
 (
 
 bind_addr = \
 (