Vpn Handler added to config.py.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index f155fcb7dbd47d1701fac903fa0ef0c43e7eeab6..ff7585623cf37c2164c67f94d457df589d8d9b59 100644 (file)
--- a/config.py
+++ b/config.py
@@ -1,32 +1,62 @@
 # 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')
+
+class Root(Handler):

 
 

-routes = dict \
-(
-    dhcp = DhcpHandler(
-        pickle_dir = 'var/lib/pymin/pickle/dhcp',
-        config_dir = 'var/lib/pymin/config/dhcp',
-    ),
-    dns = DnsHandler(
-        pickle_dir = 'var/lib/pymin/pickle/dns',
-        config_dir = 'var/lib/pymin/config/dns',
-    ),

     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 = '/tmp')
+
+    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
+
+    ppp = PppHandler(
+        pickle_dir = join(pickle_path, 'ppp'),
+        config_dir = {
+            'pap-secrets':  '/etc/ppp',
+            'chap-secrets': '/etc/ppp',
+            'options.X':    '/etc/ppp',
+            'nameX':        '/etc/ppp/peers',
+        })
+
+    vpn = VpnHandler(
+         pickle_dir = join(pickle_path, 'vpn'),
+         config_dir = join(config_path, 'vpn'))
+

     ip = IpHandler(
     ip = IpHandler(

-        pickle_dir = 'var/lib/pymin/pickle/ip',
-        config_dir = 'var/lib/pymin/config/ip',
-    ),
-)
+        pickle_dir = join(pickle_path, 'ip'),
+        config_dir = join(config_path, 'ip'))
+
+    dns = DnsHandler(
+        pickle_dir = join(pickle_path, 'dns'),
+        config_dir = {
+            'named.conf': '/etc',
+            'zoneX.zone': '/var/lib/named',
+        })
+
+    dhcp = DhcpHandler(
+        pickle_dir = join(pickle_path, 'dhcp'),
+        config_dir = '/etc')
+
+    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'),
+        pid_dir    = '/var/run')
+
+    qos = QoSHandler(
+       pickle_dir = join(pickle_path, 'qos'),
+       config_dir = join(config_path, 'qos'))

 
 bind_addr = \
 (
 
 bind_addr = \
 (