Use a handler object as the root dispatcher handler instead of a dict.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index f135b23e20371cab8cc672d30c01ab16c4d1516b..5ae043d9ac0f3aa10f308c04590d3aed6a8b8f0e 100644 (file)
--- a/config.py
+++ b/config.py
@@ -1,28 +1,24 @@
 # vim: set et sts=4 sw=4 encoding=utf-8 :
 
-from services import *
-from dispatcher import handler
+from pymin.services import *
+from pymin.dispatcher import Handler
 
-# XXX for testing only
-@handler
-def test_func(*args):
-    print 'func:', args
-
-routes = dict \
-(
+class Root(Handler):
     dhcp = DhcpHandler(
         pickle_dir = 'var/lib/pymin/pickle/dhcp',
-        config_dir = 'var/lib/pymin/config/dhcp',
-    ),
+        config_dir = 'var/lib/pymin/config/dhcp')
     dns = DnsHandler(
         pickle_dir = 'var/lib/pymin/pickle/dns',
-        config_dir = 'var/lib/pymin/config/dns',
-    ),
+        config_dir = 'var/lib/pymin/config/dns')
     firewall = FirewallHandler(
         pickle_dir = 'var/lib/pymin/pickle/firewall',
-        config_dir = 'var/lib/pymin/config/firewall',
-    ),
-)
+        config_dir = 'var/lib/pymin/config/firewall')
+    ip = IpHandler(
+        pickle_dir = 'var/lib/pymin/pickle/ip',
+        config_dir = 'var/lib/pymin/config/ip')
+    proxy = ProxyHandler(
+        pickle_dir = 'var/lib/pymin/pickle/proxy',
+        config_dir = 'var/lib/pymin/config/proxy')
 
 bind_addr = \
 (