--- /etc/rc.d/openvpn	2010-05-18 11:16:22.333884987 +0200
+++ /etc/rc.d/openvpn	2010-05-18 11:05:44.000000000 +0200
@@ -6,30 +6,25 @@
 CFGDIR="/etc/openvpn"
 STATEDIR="/var/run/openvpn"
 
+cfg="${0##*.}"
 case "$1" in
   start)
-    stat_busy "Starting OpenVPN ... "
+    stat_busy "Starting OpenVPN ${cfg}"
     success=0
     mkdir -p "${STATEDIR}"
-    for cfg in "${CFGDIR}"/*.conf; do
-      stat_append "$(basename "${cfg}" .conf) "
-      /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$?
-    done
+    /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"${cfg}".pid --cd "${CFGDIR}" --config "${CFGDIR}"/"${cfg}".conf || success=$?
     if [ $success -eq 0 ]; then
-      add_daemon openvpn
+      add_daemon openvpn.${cfg}
       stat_done
     else
       stat_fail
     fi
     ;;
   stop)
-    stat_busy "Stopping OpenVPN ..."
-    for pidfile in "${STATEDIR}"/*.pid; do
-      stat_append "$(basename "${pidfile}" .pid) "
-      kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
-      rm -f "${pidfile}"
-    done
-    rm_daemon openvpn
+    stat_busy "Stopping OpenVPN ${cfg}"
+    kill $(cat "${STATEDIR}"/"${cfg}".pid 2>/dev/null) 2>/dev/null
+    rm -f "${STATEDIR}"/"${cfg}".pid
+    rm_daemon openvpn.${cfg}
     stat_done
     ;;
   restart)