/mandos/trunk

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

« back to all changes in this revision

Viewing changes to network-hooks.d/openvpn

  • Committer: Teddy Hogeborn
  • Date: 2012-05-26 22:21:17 UTC
  • mto: This revision was merged to the branch mainline in revision 591.
  • Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh
* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
 
38
38
openvpn=/usr/sbin/openvpn
39
39
 
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
 
40
do_start(){
 
41
    "$openvpn" --cd "$MANDOSNETHOOKDIR" --daemon 'openvpn(Mandos)' \
 
42
        --writepid "$PIDFILE" --config "$CONFIG"
 
43
     sleep "$DELAY"
 
44
}
 
45
 
 
46
do_stop(){
 
47
    PID="`cat \"$PIDFILE\"`"
 
48
    if [ "$PID" -gt 0 ]; then
 
49
        kill "$PID"
 
50
    fi
 
51
}
 
52
 
 
53
case "${MODE:-$1}" in
 
54
    start|stop)
 
55
        do_"${MODE:-$1}"
52
56
        ;;
53
57
    files)
54
58
        echo "$openvpn"