Added the protocol specification.

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index b4c454d3bad9dcb52a3488eb7089b5e516686042..91d8e2eb8d2c2ed72cccce32807c303098c25ff5 100644 (file)
--- a/config.py
+++ b/config.py
@@ -11,6 +11,12 @@ config_path = join(base_path, 'config')
 
 class Root(Handler):
 
 
 class Root(Handler):
 

+    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 = '/tmp')
     firewall = FirewallHandler(
         pickle_dir = join(pickle_path, 'firewall'),
         config_dir = '/tmp')


@@ -26,6 +32,10 @@ class Root(Handler):
             'nameX':        '/etc/ppp/peers',
         })
 
             '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'))
     ip = IpHandler(
         pickle_dir = join(pickle_path, 'ip'),
         config_dir = join(config_path, 'ip'))


@@ -43,16 +53,20 @@ class Root(Handler):
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),

-        config_dir = join(config_path, 'proxy'))
+        config_dir = '/etc/squid')

 
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
         config_dir = join(config_path, 'vrrp'),
         pid_dir    = '/var/run')
 
 
     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'))
+    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 = \
 (
 
 bind_addr = \
 (