/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 at recompile
  • Date: 2012-02-26 11:47:19 UTC
  • mto: (237.7.109 trunk)
  • mto: This revision was merged to the branch mainline in revision 300.
  • Revision ID: teddy@recompile.se-20120226114719-m3odq4s34ebt6hg8
Add facilities for D-Bus interface annotations and use them to mark
the old D-Bus interfaces as deprecated.

* mandos (dbus_interface_annotations): New decorator.
  (DBusObjectWithProperties._is_dbus_property): Removed.  All callers
                                                changed.
  (DBusObjectWithProperties._is_dbus_thing): New; generalized version
                                             of "_is_dbus_property".
  (DBusObjectWithProperties._get_all_dbus_properties): Removed.  All
                                                       callers
                                                       changed.
  (DBusObjectWithProperties._get_all_dbus_things): New; generalized
                                                   version of
                                                   "_get_all_dbus_properties".
  (DBusObjectWithProperties.Introspect): Also add interface
                                         annotation tags.
  (AlternateDBusNamesMetaclass.__new__): Also copy interface
                                         annotations.  Add
                                         "deprecated" annotation on
                                         old interface.
  (ClientDBus._foo): New interface annotation to mark non-compliance
                     with the standard property change signal
                     interface.
  (MandosDBusService): Inherit from DBusObjectWithProperties to get
                       interface annotation support.
  (MandosDBusService._foo): New interface annotation to mark
                            non-compliance with the standard property
                            change signal interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#!/bin/sh
 
2
#
 
3
# This is an example of a Mandos client network hook.  This hook
 
4
# brings up an OpenVPN interface as specified in a separate
 
5
# configuration file.  To be used, this file and any needed
 
6
# configuration file(s) should be copied into the
 
7
# /etc/mandos/network-hooks.d directory.
 
8
 
9
# Copyright © 2012 Teddy Hogeborn
 
10
# Copyright © 2012 Björn Påhlsson
 
11
 
12
# Copying and distribution of this file, with or without modification,
 
13
# are permitted in any medium without royalty provided the copyright
 
14
# notice and this notice are preserved.  This file is offered as-is,
 
15
# without any warranty.
 
16
 
 
17
set -e
 
18
 
 
19
CONFIG="openvpn.conf"
 
20
 
 
21
# Extract the "dev" setting from the config file
 
22
VPNDEVICE=`sed -n -e 's/[[:space:]]#.*//' \
 
23
    -e 's/^[[:space:]]*dev[[:space:]]\+//p' \
 
24
    "$MANDOSNETHOOKDIR/$CONFIG"`
 
25
 
 
26
PIDFILE=/run/openvpn-mandos.pid
 
27
 
 
28
# Exit if no device set in config
 
29
if [ -z "$VPNDEVICE" ]; then
 
30
    exit
 
31
fi
 
32
 
 
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
 
36
fi
 
37
 
 
38
openvpn=/usr/sbin/openvpn
 
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
 
52
        ;;
 
53
    files)
 
54
        echo "$openvpn"
 
55
        ;;
 
56
    modules)
 
57
        echo tun
 
58
        ;;
 
59
esac