Merge branch 'master' into suse

diff --git a/config.py b/config.py
index 8cc2dcf8f37b77494f27c1c38131a4d83d5e0198..5854e3497073ce11b418592c2e7b7afd8884a571 100644 (file)
--- a/config.py
+++ b/config.py
@@ -26,6 +26,10 @@ class Root(Handler):
             'nameX':        '/etc/ppp/peers',
         })
 
+    vpn = VpnHandler(
+         pickle_dir = join(pickle_path, 'vpn'),
+         config_dir = join(config_path, 'vpn'))
+
     ip = IpHandler(
         pickle_dir = join(pickle_path, 'ip'),
         config_dir = join(config_path, 'ip'))

diff --git a/pymin/services/vpn/templates/tinc.conf b/pymin/services/vpn/templates/tinc.conf
index a3e45ffc3d092664e883f4074a2f9ba71ea4b1de..066e35575715d149cd675ccd9794072e7bb9298d 100644 (file)
--- a/pymin/services/vpn/templates/tinc.conf
+++ b/pymin/services/vpn/templates/tinc.conf
@@ -2,3 +2,4 @@ Name = ${vpn.vpn_src}
 Device = /dev/net/tun
 PrivateKeyFile = /etc/tinc/${vpn.vpn_src}/rsa_key.priv
 ConnectTo = ${vpn.vpn_dst}
+Mode = switch