diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-11-01 14:33:19 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-11-01 14:33:19 -0200 |
| commit | 97b23327ec2da81c279c4f3995327956409e4b17 (patch) | |
| tree | 9c61fd3d4d9e413868491181c05a3a5f5326bb7a /files | |
| parent | 01fc01e9a726e0fad10aa4285b858b2eb1062c0f (diff) | |
| download | puppet-mumble-97b23327ec2da81c279c4f3995327956409e4b17.tar.gz puppet-mumble-97b23327ec2da81c279c4f3995327956409e4b17.tar.bz2 | |
Initial ecdhforce support
Diffstat (limited to 'files')
| -rwxr-xr-x | files/init.d/mumble-server.Debian | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/files/init.d/mumble-server.Debian b/files/init.d/mumble-server.Debian index e7771e3..61b6808 100755 --- a/files/init.d/mumble-server.Debian +++ b/files/init.d/mumble-server.Debian @@ -28,6 +28,10 @@ MURMUR_DAEMON_START=0 MURMUR_USE_CAPABILITIES=0 MURMUR_LIMIT_NOFILE=0 +# ECDHE Perfect Forward Secrecy on the Murmur server via an LD_PRELOAD +# https://github.com/ultramancool/ecdhforce +STARTSTOP="LD_PRELOAD=/var/lib/mumble-server/ecdhforce/ecdhforce.so start-stop-daemon" + # Include murmur defaults if available if [ -f /etc/default/$NAME ] ; then . /etc/default/$NAME @@ -49,13 +53,13 @@ case "$1" in [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" [ -d $PIDDIR ] || install -o $USER -d $PIDDIR if [ "$MURMUR_USE_CAPABILITIES" != "1" ] ; then - start-stop-daemon --start --quiet \ + $STARTSTOP --start --quiet \ --pidfile $PIDFILE \ --chuid $USER:$GROUP \ --exec $DAEMON \ -- $DAEMON_OPTS else - start-stop-daemon --start --quiet \ + $STARTSTOP --start --quiet \ --pidfile $PIDFILE \ --exec $DAEMON \ -- $DAEMON_OPTS @@ -67,7 +71,7 @@ case "$1" in ;; stop) [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - start-stop-daemon --stop --quiet \ + $STARTSTOP --stop --quiet \ --retry=TERM/30/KILL/5 \ --pidfile $PIDFILE \ --user $USER \ @@ -80,7 +84,7 @@ case "$1" in esac ;; force-reload) - start-stop-daemon --stop --test --quiet \ + $STARTSTOP --stop --test --quiet \ --pidfile $PIDFILE \ --user $USER \ --exec $DAEMON \ @@ -88,7 +92,7 @@ case "$1" in ;; restart) [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME" - start-stop-daemon --stop --quiet \ + $STARTSTOP --stop --quiet \ --retry=TERM/30/KILL/5 \ --pidfile $PIDFILE \ --user $USER \ @@ -98,13 +102,13 @@ case "$1" in [ -d $PIDDIR ] || install -o $USER -d $PIDDIR rm -f $PIDFILE if [ "$MURMUR_USE_CAPABILITIES" != "1" ] ; then - start-stop-daemon --start --quiet \ + $STARTSTOP --start --quiet \ --pidfile $PIDFILE \ --chuid $USER:$GROUP \ --exec $DAEMON \ -- $DAEMON_OPTS else - start-stop-daemon --start --quiet \ + $STARTSTOP --start --quiet \ --pidfile $PIDFILE \ --exec $DAEMON \ -- $DAEMON_OPTS |