Create a package named pymin with all the pymin modules.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index 1ae766d6364568d40b888d904c79ee43c4d80c28..059faaeea54762900ef6162904c8888a767a0b30 100644 (file)
--- a/config.py
+++ b/config.py
@@ -1,7 +1,7 @@
 # vim: set et sts=4 sw=4 encoding=utf-8 :
 
 # 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
 
 # XXX for testing only
 @handler


@@ -10,7 +10,6 @@ def test_func(*args):
 
 routes = dict \
 (
 
 routes = dict \
 (

-    test = test_func,

     dhcp = DhcpHandler(
         pickle_dir = 'var/lib/pymin/pickle/dhcp',
         config_dir = 'var/lib/pymin/config/dhcp',
     dhcp = DhcpHandler(
         pickle_dir = 'var/lib/pymin/pickle/dhcp',
         config_dir = 'var/lib/pymin/config/dhcp',


@@ -18,7 +17,19 @@ routes = dict \
     dns = DnsHandler(
         pickle_dir = 'var/lib/pymin/pickle/dns',
         config_dir = 'var/lib/pymin/config/dns',
     dns = DnsHandler(
         pickle_dir = 'var/lib/pymin/pickle/dns',
         config_dir = 'var/lib/pymin/config/dns',

-    )
+    ),
+    firewall = FirewallHandler(
+        pickle_dir = 'var/lib/pymin/pickle/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 = \
 )
 
 bind_addr = \