Move ip_forward activation from config to pymind.

This should go away anyways (either documenting that that feature should
be enabled before pymind starts or by moving it to the IP service).

diff --git a/config.py b/config.py
index 26f84428ef7cca0e89bc300e013b771831b6e265..895e51af2bc0d9e54adfa66f2685293d5c3ffc27 100644 (file)
--- a/config.py
+++ b/config.py
@@ -16,13 +16,6 @@ pickle_path = join(base_path, 'pickle')
 # FIXME, this should be specific for each service
 config_path = join(base_path, 'config')
 
-try:
-    f = file("/proc/sys/net/ipv4/ip_forward","w")
-    f.write("1")
-    f.close()
-except (IOError, OSError), e:
-    print "Can't set ip_forward:", e
-
 class firewall:
     pickle_dir = join(pickle_path, 'firewall')
     config_dir = join(config_path, 'firewall')

diff --git a/pymind b/pymind
index 488b34eafc366559da36cbefdc7198d300044de3..3014539e0734fb713b7ec53e313c2b5f1a77abef 100755 (executable)
--- a/pymind
+++ b/pymind
@@ -30,5 +30,13 @@ def build_root(config):
         setattr(root, name, service.get_service(config))
     return root
 
+# FIXME
+try:
+    f = file("/proc/sys/net/ipv4/ip_forward","w")
+    f.write("1")
+    f.close()
+except (IOError, OSError), e:
+    log.warning("Can't set ip_forward: %s", e)
+
 PyminDaemon(build_root(config), config.bind_addr).run()