Merge branch 'master' into suse

diff --git a/config.py b/config.py
index ff7585623cf37c2164c67f94d457df589d8d9b59..5854e3497073ce11b418592c2e7b7afd8884a571 100644 (file)
--- a/config.py
+++ b/config.py
@@ -47,16 +47,19 @@ class Root(Handler):
 
     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')
-
-    qos = QoSHandler(
-       pickle_dir = join(pickle_path, 'qos'),
-       config_dir = join(config_path, 'qos'))
+    
+    vpn = VpnHandler(
+        pickle_dir = join(pickle_path, 'vpn'),
+        config_dir = '/etc/tinc')
+    #qos = QoSHandler(
+    #  pickle_dir = join(pickle_path, 'qos'),
+    #  config_dir = join(config_path, 'qos'))
 
 bind_addr = \
 (

diff --git a/pymin/services/util.py b/pymin/services/util.py
index 739b10908dcb6b4abebec05cd32eb81500b0445c..867b3b93b7ee1ecab73191c2564ab591cddda442 100644 (file)
--- a/pymin/services/util.py
+++ b/pymin/services/util.py
@@ -216,9 +216,8 @@ def get_network_devices():
                 d[name].addrs[from_addr] = Address(from_addr,24, peer=to_addr)
             except IndexError:
                 pass
-            
     return d
-       
+
 def get_peers():
     p = subprocess.Popen(('ip', '-o', 'addr'), stdout=subprocess.PIPE,
                                                     close_fds=True)