Cleanup

diff --git a/files/ecdhforce/mumble-server.init.d.Debian b/files/ecdhforce/mumble-server.init.d.Debian
deleted file mode 100755 (executable)
index 00b5403..0000000
--- a/files/ecdhforce/mumble-server.init.d.Debian
+++ /dev/null
@@ -1,129 +0,0 @@
-#! /bin/sh
-#
-### BEGIN INIT INFO
-# Provides:             mumble-server
-# Required-Start:       $network $local_fs $remote_fs dbus
-# Required-Stop:       $network $local_fs $remote_fs dbus
-# Should-Start:                $mysql
-# Should-Stop:         $mysql
-# Default-Start:        2 3 4 5
-# Default-Stop:         0 1 6
-# Short-Description:    Mumble VoIP Server
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=mumble-server
-DESC="Mumble VoIP Server"
-PIDDIR=/var/run/$NAME
-PIDFILE=$PIDDIR/$NAME.pid
-DAEMON=/usr/sbin/murmurd
-USER=mumble-server
-GROUP=mumble-server
-
-test -x $DAEMON || exit 0
-
-INIFILE=/etc/mumble-server.ini
-DAEMON_OPTS="-ini $INIFILE"
-MURMUR_DAEMON_START=0
-MURMUR_USE_CAPABILITIES=0
-MURMUR_LIMIT_NOFILE=0
-
-# Include murmur defaults if available
-if [ -f /etc/default/$NAME ] ; then
-       . /etc/default/$NAME
-fi
-
-. /lib/init/vars.sh
-. /lib/lsb/init-functions
-
-if [ "$MURMUR_LIMIT_NOFILE" -gt 0 ] ; then
-       ulimit -n $MURMUR_LIMIT_NOFILE
-fi
-
-case "$1" in
-  start)
-       if [ "$MURMUR_DAEMON_START" != "1" ] ; then
-               log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
-               exit 0
-       fi
-       [ "$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 \
-               --pidfile $PIDFILE \
-               --chuid $USER:$GROUP \
-               --exec $DAEMON \
-               -- $DAEMON_OPTS
-       else
-         $start-stop-daemon --start --quiet \
-               --pidfile $PIDFILE \
-               --exec $DAEMON \
-               -- $DAEMON_OPTS
-       fi
-       case "$?" in
-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-       esac
-       ;;
-  stop)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-       $start-stop-daemon --stop --quiet \
-               --retry=TERM/30/KILL/5 \
-               --pidfile $PIDFILE \
-               --user $USER \
-               --exec $DAEMON
-       case "$?" in
-               0|1)    rm -f $PIDFILE
-                       [ "$VERBOSE" != no ] && log_end_msg 0
-                       ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-       esac
-       ;;
-  force-reload)
-       $start-stop-daemon --stop --test --quiet \
-               --pidfile $PIDFILE \
-               --user $USER \
-               --exec $DAEMON \
-       && $0 restart || exit 0
-       ;;
-  restart)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME"
-       $start-stop-daemon --stop --quiet \
-               --retry=TERM/30/KILL/5 \
-               --pidfile $PIDFILE \
-               --user $USER \
-               --exec $DAEMON
-       case "$?" in
-               0|1)
-                       [ -d $PIDDIR ] || install -o $USER -d $PIDDIR
-                       rm -f $PIDFILE
-                       if [ "$MURMUR_USE_CAPABILITIES" != "1" ] ; then
-                         $start-stop-daemon --start --quiet \
-                               --pidfile $PIDFILE \
-                               --chuid $USER:$GROUP \
-                               --exec $DAEMON \
-                               -- $DAEMON_OPTS
-                       else
-                         $start-stop-daemon --start --quiet \
-                               --pidfile $PIDFILE \
-                               --exec $DAEMON \
-                               -- $DAEMON_OPTS
-                       fi
-                       case "$?" in
-                               0) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-                               *) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-                       esac
-                       ;;
-               *)
-                       [ "$VERBOSE" != no ] && log_end_msg 0
-                       ;;
-       esac
-       ;;
-  *)
-       N=/etc/init.d/$NAME
-       echo "Usage: $N {start|stop|restart|force-reload}" >&2
-       exit 3
-       ;;
-esac
-
-exit 0

diff --git a/manifests/ecdhforce.pp b/manifests/ecdhforce.pp
index bf4104a3a1f2e9507e778e8e8286f8ad8f3a514d..47812b3b9cd40ef125fbf4fa2052ae09e85d6e0b 100644 (file)
--- a/manifests/ecdhforce.pp
+++ b/manifests/ecdhforce.pp
@@ -31,22 +31,11 @@ class mumble::ecdhforce {
     group   => root,
   }
 
-  # TODO: remove definition in the future
-  file { '/etc/init.d/mumble-server':
-    ensure  => present,
-    owner   => root,
-    group   => root,
-    mode    => 0755,
-    source  => "puppet:///modules/mumble/ecdhforce/mumble-server.init.d.${::operatingsystem}",
-    require => Exec['ecdhforce-link'],
-    notify  => Service['mumble-server'],
-  }
-
   file { '/etc/default/mumble-server':
     ensure  => present,
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => 0644,
     source  => "puppet:///modules/mumble/ecdhforce/mumble-server.${::operatingsystem}",
     require => Exec['ecdhforce-link'],
     notify  => Service['mumble-server'],