diff --git a/Bundler/openvpn.xml b/Bundler/openvpn.xml
index 688b7d0..84f198e 100644
--- a/Bundler/openvpn.xml
+++ b/Bundler/openvpn.xml
@@ -11,4 +11,5 @@
+
diff --git a/Cfg/etc/openvpn/allowed_clients/allowed_clients b/Cfg/etc/openvpn/allowed_clients/allowed_clients
new file mode 100644
index 0000000..10e8998
--- /dev/null
+++ b/Cfg/etc/openvpn/allowed_clients/allowed_clients
@@ -0,0 +1,4 @@
+ovh.vpn.crans.org
+soyoustart.vpn.crans.org
+komaz.vpn.crans.org
+freebox.vpn.crans.org
diff --git a/Cfg/etc/openvpn/ovh.conf/ovh.conf b/Cfg/etc/openvpn/ovh.conf/ovh.conf
index 378d642..09a353f 100644
--- a/Cfg/etc/openvpn/ovh.conf/ovh.conf
+++ b/Cfg/etc/openvpn/ovh.conf/ovh.conf
@@ -9,7 +9,7 @@ mode server
tls-server
ca /etc/ssl/certs/cacert.org.pem
cert /etc/ssl/certs/vpn.pem
-tls-verify "/usr/scripts/utils/verify-cn ovh.vpn.crans.org"
+tls-verify "/usr/scripts/utils/verify-cn /etc/openvpn/allowed_clients"
key /etc/ssl/private/vpn.pem
log-append /var/log/openvpn/ovh.log
diff --git a/Cfg/etc/openvpn/ovh.connect/ovh.connect b/Cfg/etc/openvpn/ovh.connect/ovh.connect
index fd4cd11..71df6c2 100755
--- a/Cfg/etc/openvpn/ovh.connect/ovh.connect
+++ b/Cfg/etc/openvpn/ovh.connect/ovh.connect
@@ -4,12 +4,22 @@
#
# Configuration lorsque ovh se connecte via se point du reseau (komaz
# ou titanic)
+case $common_name in
+ ovh.vpn.crans.org)
+ echo "ovh connected"
+ ovh_ip=10.231.136.8
+ ;;
+ soyoustart.vpn.crans.org)
+ echo "soyoustart connected"
+ ovh_ip=10.231.136.108
+ ;;
+ *)
+ ;;
+esac
-echo "ovh connected"
iface=$(/sbin/route -n|awk '$1 == "10.231.136.0" {print $8}')
my_ip=$(ip addr show dev $iface|awk '$1 == "inet" {sub("/.*", "", $2); print $2}')
-ovh_ip=10.231.136.8
ip addr add $my_ip peer $ovh_ip/32 dev tun-ovh
ip link set up dev tun-ovh
diff --git a/Cfg/etc/openvpn/ovh.disconnect/ovh.disconnect b/Cfg/etc/openvpn/ovh.disconnect/ovh.disconnect
index c86cb73..f4dbdb8 100755
--- a/Cfg/etc/openvpn/ovh.disconnect/ovh.disconnect
+++ b/Cfg/etc/openvpn/ovh.disconnect/ovh.disconnect
@@ -4,10 +4,10 @@
#
# Configuration lorsque la connexion avec ovh est perdue
-echo "ovh disconnected"
+echo "$common_name disconnected"
iface=$(/sbin/route -n|awk '$1 == "10.231.136.0" {print $8}')
-ovh_ip=10.231.136.8
+ovh_ip=$ifconfig_pool_remote_ip
ip neigh del proxy $ovh_ip dev $iface
ip link set down dev tun-ovh
diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index e75af43..98187f4 100644
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -8,6 +8,7 @@
+
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index ec9d258..95f89e3 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -211,6 +211,17 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Python/etc/apt/sources.list b/Python/etc/apt/sources.list
index 123fe46..0bbab68 100644
--- a/Python/etc/apt/sources.list
+++ b/Python/etc/apt/sources.list
@@ -21,7 +21,7 @@ components = "main"
if has("non-free"):
components = "main contrib non-free"
-if has("ovh"):
+if has("ovh") or has("soyoustart"):
@# Dépôt classique
source("ftp://mir1.ovh.net/debian/ %s %s" % (distro, components))
@# Dépôt de mises à jour fréquentes (volatile)
diff --git a/etc/python/template/openvpn.py b/etc/python/template/openvpn.py
index edcb64c..84801ba 100644
--- a/etc/python/template/openvpn.py
+++ b/etc/python/template/openvpn.py
@@ -11,7 +11,7 @@ dev tun-%(remote_name)s
tls-client
ca /etc/ssl/certs/cacert.org.pem
cert /etc/ssl/certs/vpn.pem
-tls-verify "/usr/scripts/utils/verify-cn %(remote_name)s.vpn.crans.org"
+tls-verify "/usr/scripts/utils/verify-cn /etc/openvpn/allowed_clients"
key /etc/ssl/private/vpn.pem
log-append /var/log/openvpn/%(remote_name)s.log
@@ -31,6 +31,6 @@ dh /etc/openvpn/dh1024.pem
remote %(remote_pub_ip)s
""" % { "remote_name": remote,
- "local_vpn_ip": admipof("ovh"),
+ "local_vpn_ip": admip(),
"remote_vpn_ip": admipof(remote_vpn),
"remote_pub_ip": pubipof(remote) }