/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to network-hooks.d/openvpn

  • Committer: Teddy Hogeborn
  • Date: 2013-06-23 15:13:06 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: teddy@recompile.se-20130623151306-3y4zwy76d95hcvpq
* mandos: Bug fix: Make boolean options work from the config file
          again.
          Bug fix: Make --no-ipv6 work again.
          Bug fix: Add extra magic to GnuTLS priority to make it work
          with current version of GnuTLS.
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -
* plugins.d/mandos-client.xml (EXAMPLE): Minor grammar fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/openvpn
31
31
fi
32
32
 
33
33
# Exit if DEVICE is set and it doesn't match the VPN interface
34
 
if [ -n "$DEVICE" -a "$DEVICE" = "${DEVICE#$VPNDEVICE}" ]; then
35
 
    exit
 
34
if [ -n "$DEVICE" ]; then
 
35
    case "$DEVICE" in
 
36
        *,"$VPNDEVICE"*|"$VPNDEVICE"*) :;;
 
37
        *) exit;;
 
38
    esac
36
39
fi
37
40
 
38
41
openvpn=/usr/sbin/openvpn
39
42
 
40
 
case "$1" in
41
 
    start)
42
 
        "$openvpn" --cd "$MANDOSNETHOOKDIR" \
43
 
            --daemon 'openvpn(Mandos)' --writepid "$PIDFILE" \
44
 
            --config "$CONFIG"
45
 
        sleep "$DELAY"
46
 
        ;;
47
 
    stop)
48
 
        PID="`cat \"$PIDFILE\"`"
49
 
        if [ "$PID" -gt 0 ]; then
50
 
            kill "$PID"
51
 
        fi
 
43
do_start(){
 
44
    "$openvpn" --cd "$MANDOSNETHOOKDIR" --daemon 'openvpn(Mandos)' \
 
45
        --writepid "$PIDFILE" --config "$CONFIG"
 
46
     sleep "$DELAY"
 
47
}
 
48
 
 
49
do_stop(){
 
50
    PID="`cat \"$PIDFILE\"`"
 
51
    if [ "$PID" -gt 0 ]; then
 
52
        kill "$PID"
 
53
    fi
 
54
}
 
55
 
 
56
case "${MODE:-$1}" in
 
57
    start|stop)
 
58
        do_"${MODE:-$1}"
52
59
        ;;
53
60
    files)
54
61
        echo "$openvpn"