X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/b276cdc94ede3b794301573f61ce9288a51aa432..2de15b2c62a45af56ffcfb3d4aa8e5e60377bd72:/config.py

diff --git a/config.py b/config.py
index b27a59a..5854e34 100644
--- a/config.py
+++ b/config.py
@@ -10,36 +10,56 @@ pickle_path = join(base_path, 'pickle')
 config_path = join(base_path, 'config')
 
 class Root(Handler):
+
+    firewall = FirewallHandler(
+        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(
         pickle_dir = join(pickle_path, 'ip'),
         config_dir = join(config_path, 'ip'))
-    dhcp = DhcpHandler(
-        pickle_dir = join(pickle_path, 'dhcp'),
-        config_dir = '/etc')
+
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
         config_dir = {
             'named.conf': '/etc',
             'zoneX.zone': '/var/lib/named',
         })
-    firewall = FirewallHandler(
-        pickle_dir = join(pickle_path, 'firewall'),
-        config_dir = '/tmp')
-    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
+
+    dhcp = DhcpHandler(
+        pickle_dir = join(pickle_path, 'dhcp'),
+        config_dir = '/etc')
+
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
-        config_dir = '/etc/squid'))
+        config_dir = '/etc/squid')
+
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
-        config_dir = join(config_path, 'vrrp'))
-    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',
-        })
+        config_dir = join(config_path, 'vrrp'),
+        pid_dir    = '/var/run')
+    
+    vpn = VpnHandler(
+        pickle_dir = join(pickle_path, 'vpn'),
+        config_dir = '/etc/tinc')
+    #qos = QoSHandler(
+    #	pickle_dir = join(pickle_path, 'qos'),
+    #	config_dir = join(config_path, 'qos'))
 
 bind_addr = \
 (