Corrections

darcs-hash:20080304125252-af139-093af21107d9ff5907d32e380cc6c5511c311fb4.gz

etc/python/template/openvpn.py

@@ -1,34 +1,35 @@
 # -*- coding: utf-8; mode: python -*-
 
-header("Configuration du tunnel entre %s et %s" %s (hostname, remote))
+include("ip")
+
+header("Configuration du tunnel entre %s et %s" % (hostname, remote))
 
 print """
-daemon tun-main
-dev tun-main
+daemon tun-%(remote_name)s
+dev tun-%(remote_name)s
 
-tls-server
+tls-client
 ca /etc/ssl/certs/root.pem
 cert /etc/ssl/certs/vpn.pem
 tls-verify "/usr/share/openvpn/verify-cn komaz.vpn.crans.org"
 key /etc/ssl/private/vpn.pem
 
-log-append /var/log/openvpn/%s.log
+log-append /var/log/openvpn/%(remote_name)s.log
 
 port 1194
 
-ifconfig %(local)s %(remote_vpn)s
+ifconfig %(local_vpn_ip)s %(remote_vpn_ip)s
 route 10.231.136.0 255.255.255.0 vpn_gateway
 
-ping-timer-rem
-keepalive 10 60
-persist-tun
+ping 15
+ping-exit 45
 
 verb 3
 
 dh /etc/openvpn/dh1024.pem
 
-remote %s
-""" % (remote,
-       admipof("ovh"),
-       admipof(remote_vpn or remote),
-       pubipof(remote))
+remote %(remote_pub_ip)s
+""" % { "remote_name": remote,
+        "local_vpn_ip": admipof("ovh"),
+        "remote_vpn_ip": admipof(remote_vpn),
+        "remote_pub_ip": pubipof(remote) }