Add a new, backward compatible, way to specify specific config dirs.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index f135b23e20371cab8cc672d30c01ab16c4d1516b..d868c41b68de699ba42caa2465f59d9597765621 100644 (file)
--- a/config.py
+++ b/config.py
@@ -1,28 +1,33 @@
 # 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
+from os.path import join

 
 

-# XXX for testing only
-@handler
-def test_func(*args):
-    print 'func:', args
+base_path = join('var', 'lib', 'pymin')
+pickle_path = join(base_path, 'pickle')
+# FIXME, this should be specific for each service
+config_path = join(base_path, 'config')

 
 

-routes = dict \
-(
+class Root(Handler):

     dhcp = DhcpHandler(
     dhcp = DhcpHandler(

-        pickle_dir = 'var/lib/pymin/pickle/dhcp',
-        config_dir = 'var/lib/pymin/config/dhcp',
-    ),
+        pickle_dir = join(pickle_path, 'dhcp'),
+        config_dir = join(config_path, 'dhcp'))

     dns = DnsHandler(
     dns = DnsHandler(

-        pickle_dir = 'var/lib/pymin/pickle/dns',
-        config_dir = 'var/lib/pymin/config/dns',
-    ),
+        pickle_dir = join(pickle_path, 'dns'),
+        config_dir = {
+            'named.conf': join(config_path, 'dns'),
+            'zoneX.zone': join(config_path, 'dns', 'zones'),
+        })

     firewall = FirewallHandler(
     firewall = FirewallHandler(

-        pickle_dir = 'var/lib/pymin/pickle/firewall',
-        config_dir = 'var/lib/pymin/config/firewall',
-    ),
-)
+        pickle_dir = join(pickle_path, 'firewall'),
+        config_dir = join(config_path, 'firewall'))
+    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'))

 
 bind_addr = \
 (
 
 bind_addr = \
 (