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=-c

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

Conflicts:

	config.py
---

09ea1d35ebdfec884409a2e567946464822a1cd3
diff --combined config.py
index 91d8e2e,3ff98c6..a0b5498
--- a/config.py
+++ b/config.py
@@@ -11,25 -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(
@@@ -43,30 -37,30 +43,30 @@@
      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 = \
  (
diff --combined pymin/services/util.py
index 2d73c77,b8a2ace..f3bb013
--- a/pymin/services/util.py
+++ b/pymin/services/util.py
@@@ -13,8 -13,8 +13,8 @@@ from pymin.dispatcher import Handler, h
                                  CommandNotFoundError
  from pymin.seqtools import Sequence
  
- DEBUG = False
- #DEBUG = True
+ #DEBUG = False
+ DEBUG = True
  
  __ALL__ = ('Error', 'ReturnNot0Error', 'ExecutionError', 'ItemError',
              'ItemAlreadyExistsError', 'ItemNotFoundError', 'ContainerError',
@@@ -171,11 -171,10 +171,11 @@@ class Device(Sequence)
          self.name = name
          self.mac = mac
          self.ppp = ppp
 +        self.active = True
          self.addrs = dict()
          self.routes = list()
      def as_tuple(self):
 -        return (self.name, self.mac, self.addrs)
 +        return (self.name, self.mac, self.active, self.addrs)