Merge baryon.com.ar:workspace/pymin

Conflicts:

	config.py

diff --combined config.py
index db3151b2f93a4125e33cacd519736e817a33a5a4,57d0f5a2586b92ca42a14b6c2109d5e8d8df6182..b4c454d3bad9dcb52a3488eb7089b5e516686042
--- 1/config.py
--- 2/config.py
+++ b/config.py
@@@ -10,46 -10,35 +10,50 @@@ pickle_path = join(base_path, 'pickle'
  config_path = join(base_path, 'config')
  
  class Root(Handler):
 -    ip = IpHandler(
 -        pickle_dir = join(pickle_path, 'ip'),
 -        config_dir = join(config_path, 'ip'))
 +
      firewall = FirewallHandler(
          pickle_dir = join(pickle_path, 'firewall'),
 -        config_dir = join(config_path, 'firewall'))
 +        config_dir = '/tmp')
 +
      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',
 +        })
 +
 +    ip = IpHandler(
 +        pickle_dir = join(pickle_path, 'ip'),
 +        config_dir = join(config_path, 'ip'))
 +
      dns = DnsHandler(
          pickle_dir = join(pickle_path, 'dns'),
          config_dir = {
 -            'named.conf': join(config_path, 'dns'),
 -            'zoneX.zone': join(config_path, 'dns', 'zones'),
 +            'named.conf': '/etc',
 +            'zoneX.zone': '/var/lib/named',
          })
 +
      dhcp = DhcpHandler(
          pickle_dir = join(pickle_path, 'dhcp'),
 -        config_dir = join(config_path, 'dhcp'))
 -    ppp = PppHandler(
 -        pickle_dir = join(pickle_path, 'ppp'),
 -        config_dir = join(config_path, 'ppp'))
 -    vrrp = VrrpHandler(
 -        pickle_dir = join(pickle_path, 'vrrp'),
 -        config_dir = join(config_path, 'vrrp'))
 +        config_dir = '/etc')
 +
      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')
 +
+     qos = QoSHandler(
+       pickle_dir = join(pickle_path, 'qos'),
+       config_dir = join(config_path, 'qos'))
+ 
  bind_addr = \
  (
      '',   # Bind IP ('' is ANY)