Merge branch 'master' of or3st3s@baryon.com.ar:workspace/pymin into suse

Conflicts:

	config.py

diff --cc config.py
index ee3c174cf3dd0eb6c02506e2c15c71c47f4e84d2,8e7715ed0e690d1ca00c99493ef41525c709874b..db3151b2f93a4125e33cacd519736e817a33a5a4
--- 1/config.py
--- 2/config.py
+++ b/config.py
@@@ -10,45 -10,32 +10,46 @@@ 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')
 +
-     dhcp = DhcpHandler(
-         pickle_dir = join(pickle_path, 'dhcp'),
-         config_dir = '/etc')
+     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',
          })
-     nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
 +
 -        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'))
+     dhcp = DhcpHandler(
+         pickle_dir = join(pickle_path, 'dhcp'),
++        config_dir = '/etc')
 +
      proxy = ProxyHandler(
          pickle_dir = join(pickle_path, 'proxy'),
 -        config_dir = join(config_path, 'proxy'))
 +        config_dir = '/etc/squid')
 +
 +    vrrp = VrrpHandler(
 +        pickle_dir = join(pickle_path, 'vrrp'),
 +        config_dir = join(config_path, 'vrrp'),
 +        pid_dir    = '/var/run')
  
-     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',
-         })
- 
  bind_addr = \
  (
      '',   # Bind IP ('' is ANY)

diff --cc pymin/services/util.py
Simple merge