------------------------------------------------------------
revno: 69
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sat 2014-04-26 12:14:21 +0100
message:
auto update
modified:
etc/init.d/clamav-daemon
etc/init.d/clamav-freshclam
etc/init.d/clamav-milter
etc/init.d/dnsmasq
etc/init.d/gunicorn
etc/init.d/haproxy
etc/init.d/heartbeat
etc/init.d/kmod
etc/init.d/logd
etc/init.d/mumble-server
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init.d/clamav-daemon'
--- etc/init.d/clamav-daemon 2014-04-09 00:24:49 +0000
+++ etc/init.d/clamav-daemon 2014-04-26 11:14:21 +0000
@@ -31,35 +31,6 @@
[ -x "$DAEMON" ] || exit 0
[ -r /etc/default/clamav-daemon ] && . /etc/default/clamav-daemon
-status_of_proc () {
- local pidfile daemon name status
-
- pidfile=
- OPTIND=1
- while getopts p: opt ; do
- case "$opt" in
- p) pidfile="$OPTARG";;
- esac
- done
- shift $(($OPTIND - 1))
-
- if [ -n "$pidfile" ]; then
- pidfile="-p $pidfile"
- fi
- daemon="$1"
- name="$2"
-
- status="0"
- pidofproc $pidfile $daemon >/dev/null || status="$?"
- if [ "$status" = 0 ]; then
- log_success_msg "$name is running"
- return 0
- else
- log_failure_msg "$name is not running"
- return $status
- fi
-}
-
to_lower()
{
word="$1"
@@ -195,6 +166,19 @@
fi
}
+pathfind() {
+ OLDIFS=”$IFS”
+ IFS=:
+ for p in $PATH; do
+ if [ -x ”$p/$*” ]; then
+ IFS=”$OLDIFS”
+ return 0
+ fi
+ done
+ IFS=”$OLDIFS”
+ return 1
+}
+
make_dir()
{
DIR=$1
@@ -204,7 +188,7 @@
[ -n "$User" ] || User=clamav
mkdir -p -m 0755 "$DIR"
chown "$User" "$DIR"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$DIR"
+ pathfind restorecon && restorecon "$DIR"
}
# Debconf Functions
@@ -303,30 +287,28 @@
make_dir "$DataBaseDirectory"
make_dir $(dirname "$SUPERVISORPIDFILE")
-THEPIDFILE="`grep ^PidFile $CLAMAVCONF | awk '{print $2}'`"
-[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/clamav/clamd.pid'
+if [ -z "$RUN_SUPERVISED" ]; then
+ THEPIDFILE="$PidFile"
+ THEDAEMON="$NAME"
+ RELOAD="1"
+else
+ THEPIDFILE="$SUPERVISORPIDFILE"
+ THEDAEMON="$SUPERVISORNAME"
+ RELOAD="0"
+fi
+
+if [ -z "$THEPIDFILE" ]
+then
+ log_failure_msg "$NAME: Can not continue with PidFile not set"
+ exit 0
+fi
+
make_dir $(dirname "$THEPIDFILE")
chown $User $(dirname "$THEPIDFILE")
-if [ -f "$THEPIDFILE" ]; then
- CLAMDPID=`pidofproc -p $THEPIDFILE $DAEMON`
- RUNNING=$?
-else
- CLAMDPID=`pidofproc $DAEMON`
- RUNNING=$?
-fi
-
-if [ -z "$RUN_SUPERVISED" ]; then
- PID="$CLAMDPID"
-else
- [ -e "$SUPERVISORPIDFILE" ] && PID=`cat $SUPERVISORPIDFILE`
-fi
-
-[ "$PID" = '1' ] && unset PID
case "$1" in
start)
- OPTIND=1
# Check for database existance (start will fail if it's missing)
for db in main daily; do
if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ] && [ ! -e "$DATABASEDIR"/"$db".cld ]; then
@@ -338,7 +320,7 @@
done
if [ -z "$RUN_SUPERVISED" ] ; then
log_daemon_msg "Starting $DESC" "$NAME "
- start-stop-daemon --start -o -c $User --exec $DAEMON
+ start-stop-daemon --start --oknodo -c $User --exec $DAEMON --pidfile $THEPIDFILE
ret=$?
else
log_daemon_msg "Starting $DESC" "$NAME (supervised) "
@@ -349,67 +331,43 @@
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
- OPTIND=1
- if [ -n "$PID" ]; then
- kill -15 -"$PID"
- ret=$?
- sleep 1
- if kill -0 "$PID" 2>/dev/null; then
- ret=$?
- log_progress_msg "Waiting . "
- cnt=0
- while kill -0 "$PID" 2>/dev/null; do
- ret=$?
- cnt=`expr "$cnt" + 1`
- if [ "$cnt" -gt 15 ]; then
- kill -9 -"$PID"
- break
- fi
- sleep 2
- log_progress_msg ". "
- done
- fi
- else
- if [ -z "$RUN_SUPERVISED" ] ; then
- killproc -p $THEPIDFILE
- ret=$?
- else
- killproc -p $SUPERVISORPIDFILE
- ret=$?
- fi
- fi
- if [ -n "$ret" ]; then
- log_end_msg $ret
- else
- log_end_msg $?
- fi
+ start-stop-daemon --stop --oknodo --name $THEDAEMON --pidfile $THEPIDFILE --retry TERM/30/KILL/5
+ log_end_msg $?
;;
status)
- status_of_proc "$DAEMON" "$NAME"
- exit $?
+ start-stop-daemon --status --name $THEDAEMON --pidfile $THEPIDFILE
+ if [ "$?" = 0 ]; then
+ log_success_msg "$NAME is running"
+ exit 0
+ else
+ log_failure_msg "$NAME is not running"
+ exit 1
+ fi
;;
restart|force-reload)
$0 stop
$0 start
;;
reload-database)
- OPTIND=1
- log_daemon_msg "Reloading database for $DESC" "$NAME"
- if [ "$RUNNING" = 0 ] && [ -n "$CLAMDPID" ]; then
- kill -USR2 $CLAMDPID
+ if [ "$RELOAD" = "1" ]; then
+ log_daemon_msg "Reloading database for $DESC" "$NAME"
+ pkill -USR2 -F $THEPIDFILE $THEDAEMON 2>/dev/null
+ log_end_msg $?
+ else
+ log_failure_msg "reload-database does not work in supervised mode."
fi
- log_end_msg $?
;;
reload-log)
- OPTIND=1
- log_daemon_msg "Reloading log file for $DESC" "$NAME"
- if [ "$RUNNING" = 0 ] && [ -n "$CLAMDPID" ]; then
- kill -HUP $CLAMDPID
+ if [ "$RELOAD" = "1" ]; then
+ log_daemon_msg "Reloading log file for $DESC" "$NAME"
+ pkill -HUP -F $THEPIDFILE $THEDAEMON 2>/dev/null
+ else
+ log_failure_msg "reload-log does not work in supervised mode."
fi
log_end_msg $?
;;
*)
- log_failure_msg "Usage: $0 {start|stop|restart|force-reload|reload-log|reload-database|status}" >&2
+ log_action_msg "Usage: $0 {start|stop|restart|force-reload|reload-log|reload-database|status}" >&2
exit 1
;;
esac
=== modified file 'etc/init.d/clamav-freshclam'
--- etc/init.d/clamav-freshclam 2014-04-09 00:24:49 +0000
+++ etc/init.d/clamav-freshclam 2014-04-26 11:14:21 +0000
@@ -19,38 +19,8 @@
CLAMAV_CONF_FILE=/etc/clamav/clamd.conf
FRESHCLAM_CONF_FILE=/etc/clamav/freshclam.conf
-PIDFILE=/var/run/clamav/freshclam.pid
[ -f /var/lib/clamav/interface ] && INTERFACE=`cat /var/lib/clamav/interface`
-status_of_proc () {
- local pidfile daemon name status
-
- pidfile=
- OPTIND=1
- while getopts p: opt ; do
- case "$opt" in
- p) pidfile="$OPTARG";;
- esac
- done
- shift $(($OPTIND - 1))
-
- if [ -n "$pidfile" ]; then
- pidfile="-p $pidfile"
- fi
- daemon="$1"
- name="$2"
-
- status="0"
- pidofproc $pidfile $daemon >/dev/null || status="$?"
- if [ "$status" = 0 ]; then
- log_success_msg "$name is running"
- return 0
- else
- log_failure_msg "$name is not running"
- return $status
- fi
-}
-
to_lower()
{
word="$1"
@@ -186,6 +156,19 @@
fi
}
+pathfind() {
+ OLDIFS=”$IFS”
+ IFS=:
+ for p in $PATH; do
+ if [ -x ”$p/$*” ]; then
+ IFS=”$OLDIFS”
+ return 0
+ fi
+ done
+ IFS=”$OLDIFS”
+ return 1
+}
+
make_dir()
{
DIR=$1
@@ -195,7 +178,7 @@
[ -n "$User" ] || User=clamav
mkdir -p -m 0755 "$DIR"
chown "$User" "$DIR"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$DIR"
+ pathfind restorecon && restorecon "$DIR"
}
# Debconf Functions
@@ -265,23 +248,21 @@
slurp_config "$FRESHCLAM_CONF_FILE"
-[ -n "$PidFile" ] && PIDFILE="$PidFile"
+if [ -z "$PidFile" ]
+then
+ log_failure_msg "$NAME: Can not continue with PidFile not set"
+ exit 1
+fi
[ -n "$DataBaseDirectory" ] || DataBaseDirectory=/var/run/clamav
make_dir "$DataBaseDirectory"
make_dir $(dirname "$PidFile")
-if [ -f "$PIDFILE" ]; then
- PID=`pidofproc -p $PIDFILE $DAEMON`
- RUNNING=$?
-else
- PID=`pidofproc $DAEMON`
- RUNNING=$?
-fi
-
handle_iface()
{
- OPTIND=1
+ pkill -0 -F $PidFile $NAME 2>/dev/null
+ RUNNING=$?
+
if [ "$1" = "stop" ] && [ "$RUNNING" != 0 ]; then
return 1
elif [ "$1" = "start" ] && [ "$RUNNING" = 0 ]; then
@@ -322,12 +303,20 @@
[ -z "$DatabaseDirectory" ] && DatabaseDirectory=/var/lib/clamav/
[ -n "$DatabaseOwner" ] || DatabaseOwner=clamav
+if [ ! -f "$PidFile" ]
+then
+ # If clamd is run under a different UID than freshclam then we need
+ # to make sure the PidFile can be written or else we won't be able to
+ # kill it.
+ touch $PidFile
+ chown $DatabaseOwner $PidFile
+fi
+
case "$1" in
no-daemon)
su "$DatabaseOwner" -p -s /bin/sh -c "freshclam -l $UpdateLogFile --datadir $DatabaseDirectory"
;;
start)
- OPTIND=1
log_daemon_msg "Starting $DESC" "$NAME"
# If user wants it run from cron, we only accept no-daemon and stop
if [ -f /etc/cron.d/clamav-freshclam ]; then
@@ -336,61 +325,39 @@
log_end_msg 255
exit 0
fi
- start-stop-daemon --start -o -c "$DatabaseOwner" --exec $DAEMON -- -d --quiet
+ start-stop-daemon --start --oknodo -c "$DatabaseOwner" --exec $DAEMON --pidfile $PidFile -- -d --quiet
log_end_msg $?
;;
stop)
- OPTIND=1
log_daemon_msg "Stopping $DESC" "$NAME"
- if [ -n "$PID" ]; then
- kill -15 -"$PID"
- ret=$?
- sleep 1
- if kill -0 "$PID" 2>/dev/null; then
- ret=$?
- log_progress_msg "Waiting . "
- cnt=0
- while kill -0 "$PID" 2>/dev/null; do
- ret=$?
- cnt=`expr "$cnt" + 1`
- if [ "$cnt" -gt 15 ]; then
- kill -9 "$PID"
- ret=$?
- break
- fi
- sleep 2
- log_progress_msg ". "
- done
- fi
- else
- killproc -p $PIDFILE $DAEMON
- ret=$?
- fi
- log_end_msg $ret
+ start-stop-daemon --stop --oknodo --name $NAME --pidfile $PidFile --retry TERM/30/KILL/5
+ log_end_msg $?
;;
restart|force-reload)
$0 stop
$0 start
;;
reload-log)
- OPTIND=1
log_daemon_msg "Reloading $DESC" "$NAME"
- if [ "$RUNNING" = 0 ] && [ -n "$PID" ]; then
- kill -HUP $PID
- fi
+ pkill -HUP -F $PidFile $NAME
log_end_msg $?
;;
skip)
;;
status)
- status_of_proc "$DAEMON" "$NAME"
- exit $?
+ start-stop-daemon --status --name $NAME --pidfile $PidFile
+ if [ "$?" = 0 ]; then
+ log_success_msg "$NAME is running"
+ exit 0
+ else
+ log_failure_msg "$NAME is not running"
+ exit 1
+ fi
;;
*)
- log_failure_msg "Usage: $0 {no-daemon|start|stop|restart|force-reload|reload-log|skip|status}" >&2
+ log_action_msg "Usage: $0 {no-daemon|start|stop|restart|force-reload|reload-log|skip|status}" >&2
exit 1
;;
esac
exit 0
-
=== modified file 'etc/init.d/clamav-milter'
--- etc/init.d/clamav-milter 2014-04-09 00:24:49 +0000
+++ etc/init.d/clamav-milter 2014-04-26 11:14:21 +0000
@@ -17,41 +17,12 @@
NAME=clamav-milter
CLAMAVCONF=/etc/clamav/clamav-milter.conf
SUPERVISOR=/usr/bin/daemon
+SUPERVISORNAME=daemon
SUPERVISORPIDFILE="/var/run/clamav/daemon-clamav-milter.pid"
-SUPERVISORARGS="-F $SUPERVISORPIDFILE --name=$NAME --respawn"
-CLAMAVDAEMONUPGRADE="/var/run/clamav-daemon-being-upgraded"
+SUPERVISORARGS="--name=$NAME --respawn $DAEMON -F $SUPERVISORPIDFILE"
[ -x "$DAEMON" ] || exit 0
-status_of_proc () {
- local pidfile daemon name status
-
- pidfile=
- OPTIND=1
- while getopts p: opt ; do
- case "$opt" in
- p) pidfile="$OPTARG";;
- esac
- done
- shift $(($OPTIND - 1))
-
- if [ -n "$pidfile" ]; then
- pidfile="-p $pidfile"
- fi
- daemon="$1"
- name="$2"
-
- status="0"
- pidofproc $pidfile $daemon >/dev/null || status="$?"
- if [ "$status" = 0 ]; then
- log_success_msg "$name is running"
- return 0
- else
- log_failure_msg "$name is not running"
- return $status
- fi
-}
-
to_lower()
{
word="$1"
@@ -187,6 +158,19 @@
fi
}
+pathfind() {
+ OLDIFS=”$IFS”
+ IFS=:
+ for p in $PATH; do
+ if [ -x ”$p/$*” ]; then
+ IFS=”$OLDIFS”
+ return 0
+ fi
+ done
+ IFS=”$OLDIFS”
+ return 1
+}
+
make_dir()
{
DIR=$1
@@ -196,7 +180,7 @@
[ -n "$User" ] || User=clamav
mkdir -p -m 0755 "$DIR"
chown "$User" "$DIR"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$DIR"
+ pathfind restorecon && restorecon "$DIR"
}
# Debconf Functions
@@ -283,16 +267,42 @@
exit 0
fi
-if [ -z "$PidFile" ]; then
- PIDFILE=/var/run/clamav/clamav-milter.pid
-else
- PIDFILE="$PidFile"
-fi
-
-if [ -z "$MilterSocket" ]; then
- SOCKET=local:/var/run/clamav/clamav-milter.ctl
-else
- SOCKET="$MilterSocket"
+if is_true "$Foreground"; then
+ if [ ! -x "$SUPERVISOR" ] ; then
+ log_failure_msg "Foreground specified, but $SUPERVISOR not found"
+ exit 0
+ else
+ RUN_SUPERVISED=1
+ fi
+fi
+
+
+if [ -z "$RUN_SUPERVISED" ]; then
+ THEPIDFILE="$PidFile"
+ THEDAEMON="$NAME"
+ RELOAD="1"
+else
+ THEPIDFILE="$SUPERVISORPIDFILE"
+ THEDAEMON="$SUPERVISORNAME"
+ RELOAD="0"
+fi
+
+if [ -z "$THEPIDFILE" ]
+then
+ log_failure_msg "$NAME: Can not continue with PidFile not set"
+ exit 0
+fi
+
+if [ -z "$MilterSocket" ]
+then
+ log_failure_msg "$NAME: Can not continue with MilterSocket not set"
+ exit 0
+fi
+
+if [ ! -f "$THEPIDFILE" ]
+then
+ touch "$THEPIDFILE"
+ chown $User "$THEPIDFILE"
fi
wait_for_socket()
@@ -325,42 +335,19 @@
fi
}
-case "$SOCKET" in
+case "$MilterSocket" in
/*)
- SOCKET_PATH="$SOCKET"
+ SOCKET_PATH="$MilterSocket"
SOCKET_TYPE="local"
;;
*)
- SOCKET_PATH="${SOCKET#*:}"
- SOCKET_TYPE="${SOCKET%%:*}"
+ SOCKET_PATH="${MilterSocket#*:}"
+ SOCKET_TYPE="${MilterSocket%%:*}"
;;
esac
SOCKET_TYPE="${SOCKET_TYPE:-local}"
SOCKET="${SOCKET_TYPE}:${SOCKET_PATH}"
-if is_true "$Foreground"; then
- if [ ! -x "$SUPERVISOR" ] ; then
- log_failure_msg "Foreground specified, but $SUPERVISOR not found"
- exit 0
- else
- RUN_SUPERVISED=1
- SUPERVISOR_EXEC="$DAEMON $OPTIONS"
- fi
-fi
-
-if [ -z "$RUN_SUPERVISED" ] ; then
- if [ -f "$PIDFILE" ]; then
- PID=`pidofproc -p $PIDFILE $DAEMON`
- RUNNING=$?
- else
- PID=`pidofproc $DAEMON`
- RUNNING=$?
- fi
-else
- [ -e "$SUPERVISORPIDFILE" ] && PID=`sed 's/[^0-9]//g' $SUPERVISORPIDFILE`
-fi
-
-[ "$PID" = '1' ] && unset PID
[ -n "$User" ] || User=clamav
[ -n "$DataBaseDirectory" ] || DataBaseDirectory=/var/run/clamav
@@ -370,31 +357,25 @@
chown $User $(dirname "$SOCKET_PATH")
fi
-make_dir $(dirname "$PIDFILE")
-chown $User $(dirname "$PIDFILE")
+make_dir $(dirname "$THEPIDFILE")
+if [ ! -f "$THEPIDFILE" ]
+then
+ # If clam is run under a different UID than milter then we need
+ # to make sure the THEPIDFILE can be written or else we won't be
+ # able to kill it.
+ touch $THEPIDFILE
+ chown $User $THEPIDFILE
+fi
case "$1" in
start)
- OPTIND=1
- if [ -n "$PID" ]; then
- PID=`echo $PID | sed 's/[^0-9]//g'`
- if kill -0 $PID; then
- log_failure_msg "$DAEMON already running"
- exit 1
- fi
- fi
- if [ -e "$CLAMAVDAEMONUPGRADE" ] && [ "$RESTART_AFTER_CLAMD" = 'yes' ]; then
- touch $CLAMAVDAEMONUPGRADE.milter-restart
- log_warning_msg "clamd may be required to run $DAEMON, clamav-milter will be restarted by clamav-daemon"
- exit 0
- fi
if [ -z "$RUN_SUPERVISED" ] ; then
log_daemon_msg "Starting $DESC" "$NAME"
- start-stop-daemon --start -o -c $User --exec $DAEMON
+ start-stop-daemon --start --oknodo -c $User --exec $DAEMON --pidfile $THEPIDFILE
ret=$?
else
log_daemon_msg "Starting $DESC" "$NAME (supervised)"
- $SUPERVISOR $SUPERVISORARGS -X "$SUPERVISOR_EXEC"
+ $SUPERVISOR $SUPERVISORARGS
ret=$?
fi
@@ -404,45 +385,10 @@
log_end_msg $ret
;;
stop)
- OPTIND=1
log_daemon_msg "Stopping $DESC" "$NAME"
- if [ -n "$PID" ]; then
- PID=`echo $PID | sed 's/[^0-9]//g'`
- kill -15 -"$PID" 2>/dev/null || true
- ret=$?
- sleep 2
- if kill -0 "$PID" 2>/dev/null; then
- ret=$?
- log_progress_msg "Waiting . "
- cnt=0
- while kill -0 "$PID" 2>/dev/null; do
- ret=$?
- cnt=`expr "$cnt" + 1`
- if [ "$cnt" -gt 15 ]; then
- kill -9 -"$PID"
- ret=$?
- break
- fi
- sleep 2
- log_progress_msg ". "
- done
- fi
- else
- if [ -z "$RUN_SUPERVISED" ] ; then
- killproc -p $PIDFILE $DAEMON
- ret=$?
- else
- killproc -p $SUPERVISORPIDFILE
- ret=$?
- fi
- fi
- if [ -n "$ret" ]; then
- log_end_msg $ret
- else
- log_end_msg $?
- fi
+ start-stop-daemon --stop --oknodo --name $THEDAEMON --pidfile $THEPIDFILE --retry TERM/30/KILL/5
+ log_end_msg $?
[ -e "$SOCKET_PATH" ] && rm -f $SOCKET_PATH
- [ -e "$PIDFILE" ] && rm -f $PIDFILE
;;
force-reload | restart)
$0 stop
@@ -450,16 +396,21 @@
$0 start
;;
status)
- status_of_proc "$DAEMON" "$NAME"
- ret=$?
- if [ $ret = 0 ] && [ ! -S $SOCKET_PATH ] ; then
- log_failure_msg "$NAME is running but socket is missing"
- exit 4
+ start-stop-daemon --status --name $THEDAEMON --pidfile $THEPIDFILE
+ if [ "$?" = 0 ]; then
+ if [ ! -S $SOCKET_PATH ] ; then
+ log_failure_msg "$NAME is running but socket is missing"
+ exit 4
+ fi
+ log_success_msg "$NAME is running"
+ exit 0
+ else
+ log_failure_msg "$NAME is not running"
+ exit 1
fi
- exit $ret
;;
*)
- log_failure_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2
+ log_action_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2
exit 1
;;
esac
=== modified file 'etc/init.d/dnsmasq'
--- etc/init.d/dnsmasq 2014-04-09 00:24:49 +0000
+++ etc/init.d/dnsmasq 2014-04-26 11:14:21 +0000
@@ -90,6 +90,14 @@
DNSMASQ_USER="dnsmasq"
fi
+# This tells dnsmasq to ignore DNS requests that don't come from a local network.
+# It's automatically ignored if --interface --except-interface, --listen-address
+# or --auth-server exist in the configuration, so for most installations, it will
+# have no effect, but for otherwise-unconfigured installations, it stops dnsmasq
+# from being vulnerable to DNS-reflection attacks.
+
+DNSMASQ_OPTS="$DNSMASQ_OPTS --local-service"
+
start()
{
# Return
=== modified file 'etc/init.d/gunicorn'
--- etc/init.d/gunicorn 2014-04-09 00:24:49 +0000
+++ etc/init.d/gunicorn 2014-04-26 11:14:21 +0000
@@ -1,8 +1,8 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: gunicorn
-# Required-Start: $all
-# Required-Stop: $all
+# Required-Start: $local_fs $remote_fs $network $syslog
+# Required-Stop: $local_fs $remote_fs $network $syslog
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
@@ -27,9 +27,6 @@
Action() {
mkdir -p $PID_DIR
- mkdir -p $LOG_DIR
- chmod 750 $LOG_DIR
- chown root:adm $LOG_DIR
log_daemon_msg "$1"
shift
=== modified file 'etc/init.d/haproxy'
--- etc/init.d/haproxy 2014-04-09 00:24:49 +0000
+++ etc/init.d/haproxy 2014-04-26 11:14:21 +0000
@@ -1,8 +1,8 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: haproxy
-# Required-Start: $local_fs $network $remote_fs
-# Required-Stop: $local_fs $remote_fs
+# Required-Start: $local_fs $network $remote_fs $syslog
+# Required-Stop: $local_fs $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: fast and reliable load balancing reverse proxy
=== modified file 'etc/init.d/heartbeat'
--- etc/init.d/heartbeat 2014-04-09 00:24:49 +0000
+++ etc/init.d/heartbeat 2014-04-26 11:14:21 +0000
@@ -18,6 +18,7 @@
# pidfile: /var/run/heartbeat.pid
# config: /etc/ha.d/ha.cf
#
+
### BEGIN INIT INFO
# Description: heartbeat is a basic high-availability subsystem.
# It will start services at initialization, and when machines go up
@@ -33,17 +34,20 @@
# - "ping" heartbeats (for routers, switches, etc.)
# (to be used for breaking ties in 2-node systems
# and monitoring networking availability)
-#
# Short-Description: High-availability services.
-# Provides: heartbeat HA
-# Required-Start: $remote_fs $network $time $syslog
-# Should-Start: openhpid
-# Required-Stop: $remote_fs $network $time $syslog
-# Should-stop: openhpid
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Provides: heartbeat HA
+# Required-Start: $remote_fs $network $time $syslog
+# Should-Start: openhpid
+# Required-Stop: $remote_fs $network $time $syslog
+# Should-Stop: openhpid
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
### END INIT INFO
+. /lib/lsb/init-functions
+
+HEARTBEAT=/usr/lib/heartbeat/heartbeat
+
[ -r /etc/default/heartbeat ] && . /etc/default/heartbeat
[ -r /etc/default/pacemaker ] && . /etc/default/pacemaker
[ -r /etc/default/sbd ] && . /etc/default/sbd
@@ -138,7 +142,7 @@
# Set this to a 1 if you want to automatically load kernel modules
USE_MODULES=1
-[ -x $HA_BIN/heartbeat ] || exit 0
+[ -x $HEARTBEAT ] || exit 0
#
# Some environments like it if we use their functions...
@@ -148,7 +152,7 @@
then
# Provide our own versions of these functions
status() {
- $HA_BIN/heartbeat -s
+ $HEARTBEAT -s
}
echo_failure() {
echo " Heartbeat failure [rc=$1]. $rc_failed"
@@ -293,7 +297,7 @@
start_heartbeat() {
if
- ERROR=`$HA_BIN/heartbeat 2>&1`
+ ERROR=`$HEARTBEAT 2>&1`
then
: OK
else
@@ -375,7 +379,7 @@
echo -n "Stopping High-Availability services: "
if
- $HA_BIN/heartbeat -k >/dev/null 2>&1 # Kill it
+ $HEARTBEAT -k >/dev/null 2>&1 # Kill it
then
StopSBD
echo_success
@@ -388,7 +392,7 @@
}
StatusHA() {
- $HA_BIN/heartbeat -s
+ $HEARTBEAT -s
}
StandbyHA() {
@@ -434,7 +438,7 @@
echo -n "Reloading High-Availability services: "
if
- $HA_BIN/heartbeat -r # Restart, and keep your resources
+ $HEARTBEAT -r # Restart, and keep your resources
then
echo_success
return 0
=== modified file 'etc/init.d/kmod'
--- etc/init.d/kmod 2014-04-09 00:24:49 +0000
+++ etc/init.d/kmod 2014-04-26 11:14:21 +0000
@@ -22,6 +22,9 @@
case "$1" in
start)
+ if init_is_upstart; then
+ exit 1
+ fi
;;
stop|restart|reload|force-reload)
=== modified file 'etc/init.d/logd'
--- etc/init.d/logd 2014-04-09 00:24:49 +0000
+++ etc/init.d/logd 2014-04-26 11:14:21 +0000
@@ -32,6 +32,8 @@
# Default-Stop: 0 1 6
### END INIT INFO
+. /lib/lsb/init-functions
+
LOGD_CFG=/etc/logd.cf
LOGD_OPT=""
[ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
=== modified file 'etc/init.d/mumble-server'
--- etc/init.d/mumble-server 2014-04-09 00:24:49 +0000
+++ etc/init.d/mumble-server 2014-04-26 11:14:21 +0000
@@ -2,14 +2,14 @@
#
### 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
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $network $local_fs $remote_fs
+# Should-Start: $mysql dbus
+# Should-Stop: $mysql dbus
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Mumble VoIP Server
-# Description: init script for the Mumble VoIP Server murmurd.
+# Description: init script for the Mumble VoIP Server murmurd.
### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
