/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 init.d-mandos

  • 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:
23
23
NAME=mandos
24
24
DAEMON=/usr/sbin/$NAME
25
25
DAEMON_ARGS=""
26
 
PIDFILE=/run/$NAME.pid
 
26
PIDFILE=/var/run/$NAME.pid
27
27
SCRIPTNAME=/etc/init.d/$NAME
28
28
 
29
29
# Exit if the package is not installed
149
149
                ;;
150
150
        esac
151
151
        ;;
152
 
  status)
153
 
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE"
154
 
        ;;
155
152
  *)
156
153
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
157
154
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2