Merge branch 'master' of or3st3s@baryon.com.ar:workspace/pymin into suse

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index ee3c174cf3dd0eb6c02506e2c15c71c47f4e84d2..db3151b2f93a4125e33cacd519736e817a33a5a4 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):
 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')
 
 
     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'),
 
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),


@@ -29,7 +37,9 @@ class Root(Handler):
             'zoneX.zone': '/var/lib/named',
         })
 
             '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'),
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),


@@ -40,15 +50,6 @@ class Root(Handler):
         config_dir = join(config_path, 'vrrp'),
         pid_dir    = '/var/run')
 
         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',
-        })
-

 bind_addr = \
 (
     '',   # Bind IP ('' is ANY)
 bind_addr = \
 (
     '',   # Bind IP ('' is ANY)