X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/031a757fb7b600a9015d018011cc7b135d7c8627..f2571fe7b62abfa67f4b805c266869058647afff:/config.py

diff --git a/config.py b/config.py
index f135b23..5ae043d 100644
--- 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 = \
 (