Add a timer handler to ppp to monitor ppp connections state.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index 3706ce9b53ec342a09f71e282cee9831b3324ff7..8e7715ed0e690d1ca00c99493ef41525c709874b 100644 (file)
--- a/config.py
+++ b/config.py
@@ -10,31 +10,31 @@ pickle_path = join(base_path, 'pickle')
 config_path = join(base_path, 'config')
 
 class Root(Handler):
 config_path = join(base_path, 'config')
 
 class Root(Handler):

-    dhcp = DhcpHandler(
-        pickle_dir = join(pickle_path, 'dhcp'),
-        config_dir = join(config_path, 'dhcp'))
+    ip = IpHandler(
+        pickle_dir = join(pickle_path, 'ip'),
+        config_dir = join(config_path, 'ip'))
+    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'),
         })
     dns = DnsHandler(
         pickle_dir = join(pickle_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'))
-    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
-    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'))
+    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'))
     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'))

 
 bind_addr = \
 (
 
 bind_addr = \
 (