Merge branch 'master' of baryon.com.ar:/home/luca/pymin

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index c6a50ed0a74028433a1ab90cb706656423fb3a3d..a0b5498cc228f50a57a330ef3319c239a5c21b47 100644 (file)
--- a/config.py
+++ b/config.py
@@ -10,30 +10,63 @@ pickle_path = join(base_path, 'pickle')
 config_path = join(base_path, 'config')
 
 class Root(Handler):
 config_path = join(base_path, 'config')
 
 class Root(Handler):

-    dhcp = DhcpHandler(
-        pickle_dir = join(pickle_path, 'dhcp'),
-        config_dir = join(config_path, 'dhcp'))
-    dns = DnsHandler(
-        pickle_dir = join(pickle_path, 'dns'),
-        config_dir = {
-            'named.conf': join(config_path, 'dns'),
-            'zoneX.zone': join(config_path, 'dns', 'zones'),
-        })
+
+    def __init__(self):
+        f = file("/proc/sys/net/ipv4/ip_forward","w")
+        f.write("1")
+        f.close()
+        #self.ip.device_up_hook(self.dns)
+

     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         config_dir = join(config_path, 'firewall'))
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         config_dir = join(config_path, 'firewall'))

+
+    nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
+
+    ppp = PppHandler(
+        pickle_dir = join(pickle_path, 'ppp'),
+        config_dir = {
+            'pap-secrets':  join(config_path, 'ppp'),
+            'chap-secrets': join(config_path, 'ppp'),
+            'options.X':    join(config_path, 'ppp'),
+            'nameX':        join(config_path, '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'))
     ip = IpHandler(
         pickle_dir = join(pickle_path, 'ip'),
         config_dir = join(config_path, 'ip'))

+
+    dns = DnsHandler(
+        pickle_dir = join(pickle_path, 'dns'),
+        config_dir = {
+            'named.conf': join(config_path, 'dns'),
+            'zoneX.zone': join(config_path, 'dns', 'zones'),
+        })
+
+    dhcp = DhcpHandler(
+        pickle_dir = join(pickle_path, 'dhcp'),
+        config_dir = join(config_path, 'dhcp'))
+

     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
         config_dir = join(config_path, 'proxy'))
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
         config_dir = join(config_path, 'proxy'))

+

     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),

-        config_dir = join(config_path, 'vrrp'))
-    ppp = PppHandler(
-        pickle_dir = join(pickle_path, 'ppp'),
-        config_dir = join(config_path, 'ppp'))
+        config_dir = join(config_path, 'vrrp'),
+        pid_dir    = join(config_path, 'vrrp', 'run'))
+
+    vpn = VpnHandler(
+        pickle_dir = join(pickle_path, 'vpn'),
+        config_dir = join(config_path, 'vpn'))
+
+    #qos = QoSHandler(
+    #    pickle_dir = join(pickle_path, 'qos'),
+    #    config_dir = join(config_path, 'qos'))

 
 bind_addr = \
 (
 
 bind_addr = \
 (