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

[software/pymin.git] / config.py

diff --git a/config.py b/config.py
index 5854e3497073ce11b418592c2e7b7afd8884a571..a0b5498cc228f50a57a330ef3319c239a5c21b47 100644 (file)
--- a/config.py
+++ b/config.py
@@ -11,19 +11,25 @@ config_path = join(base_path, 'config')
 
 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')
+        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':  '/etc/ppp',
-            'chap-secrets': '/etc/ppp',
-            'options.X':    '/etc/ppp',
-            'nameX':        '/etc/ppp/peers',
+            '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(
@@ -37,29 +43,30 @@ class Root(Handler):
     dns = DnsHandler(
         pickle_dir = join(pickle_path, 'dns'),
         config_dir = {
-            'named.conf': '/etc',
-            'zoneX.zone': '/var/lib/named',
+            'named.conf': join(config_path, 'dns'),
+            'zoneX.zone': join(config_path, 'dns', 'zones'),
         })
 
     dhcp = DhcpHandler(
         pickle_dir = join(pickle_path, 'dhcp'),
-        config_dir = '/etc')
+        config_dir = join(config_path, 'dhcp'))
 
     proxy = ProxyHandler(
         pickle_dir = join(pickle_path, 'proxy'),
-        config_dir = '/etc/squid')
+        config_dir = join(config_path, 'proxy'))
 
     vrrp = VrrpHandler(
         pickle_dir = join(pickle_path, 'vrrp'),
         config_dir = join(config_path, 'vrrp'),
-        pid_dir    = '/var/run')
-    
+        pid_dir    = join(config_path, 'vrrp', 'run'))
+
     vpn = VpnHandler(
         pickle_dir = join(pickle_path, 'vpn'),
-        config_dir = '/etc/tinc')
+        config_dir = join(config_path, 'vpn'))
+
     #qos = QoSHandler(
-    #  pickle_dir = join(pickle_path, 'qos'),
-    #  config_dir = join(config_path, 'qos'))
+    #    pickle_dir = join(pickle_path, 'qos'),
+    #    config_dir = join(config_path, 'qos'))
 
 bind_addr = \
 (