Merge branch 'master' into suse

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index d868c41b68de699ba42caa2465f59d9597765621..b27a59a254d97577ba621957ba778bfb06fc1b33 100644 (file)
--- a/config.py
+++ b/config.py
@@ -10,24 +10,36 @@ pickle_path = join(base_path, 'pickle')
 config_path = join(base_path, 'config')
 
 class Root(Handler):
 config_path = join(base_path, 'config')
 
 class Root(Handler):

+    ip = IpHandler(
+        pickle_dir = join(pickle_path, 'ip'),
+        config_dir = join(config_path, 'ip'))

     dhcp = DhcpHandler(
         pickle_dir = join(pickle_path, 'dhcp'),
     dhcp = DhcpHandler(
         pickle_dir = join(pickle_path, 'dhcp'),

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

     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
         config_dir = {
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
         config_dir = {

-            'named.conf': join(config_path, 'dns'),
-            'zoneX.zone': join(config_path, 'dns', 'zones'),
+            'named.conf': '/etc',
+            'zoneX.zone': '/var/lib/named',

         })
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         })
     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'))
+        config_dir = '/tmp')
+    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))

     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
     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'))
+    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',
+        })

 
 bind_addr = \
 (
 
 bind_addr = \
 (