From: Leandro Lucarella <llucax@gmail.com>
Date: Wed, 19 Dec 2007 17:24:10 +0000 (-0300)
Subject: Merge branch 'master' of baryon.com.ar:/home/luca/pymin
X-Git-Url: https://git.llucax.com/software/pymin.git/commitdiff_plain/09ea1d35ebdfec884409a2e567946464822a1cd3?ds=sidebyside;hp=--cc

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

Conflicts:

	config.py
---

09ea1d35ebdfec884409a2e567946464822a1cd3
diff --cc config.py
index 91d8e2e,3ff98c6..a0b5498
--- a/config.py
+++ b/config.py
@@@ -11,15 -11,9 +11,15 @@@ 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'))