Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405882 )
Change subject: Revert "ircecho: Remove support for sysvinit script"
......................................................................
Revert "ircecho: Remove support for sysvinit script"
This reverts commit 218543a121f93c28e64c88ce6646be82a3f9a9c8.
This broke shinken-01.shinken.eqiad.wmflabs which is still Trusty and does
monitoring for Tools, deployment-prep, etc
Change-Id: Icbc32180ee6e7418110d147413ebacdd8c306f43
---
M modules/ircecho/manifests/init.pp
A modules/ircecho/templates/initscripts/ircecho.sysvinit.erb
2 files changed, 145 insertions(+), 2 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/modules/ircecho/manifests/init.pp
b/modules/ircecho/manifests/init.pp
index b0b225f..bd7e9d4 100644
--- a/modules/ircecho/manifests/init.pp
+++ b/modules/ircecho/manifests/init.pp
@@ -33,9 +33,10 @@
notify => Service['ircecho'],
}
- systemd::service { 'ircecho':
+ base::service_unit { 'ircecho':
ensure => $ensure,
- content => systemd_template('ircecho'),
+ systemd => systemd_template('ircecho'),
+ sysvinit => sysvinit_template('ircecho'),
require => File['/usr/local/bin/ircecho'],
service_params => {
hasrestart => true,
diff --git a/modules/ircecho/templates/initscripts/ircecho.sysvinit.erb
b/modules/ircecho/templates/initscripts/ircecho.sysvinit.erb
new file mode 100644
index 0000000..228834f
--- /dev/null
+++ b/modules/ircecho/templates/initscripts/ircecho.sysvinit.erb
@@ -0,0 +1,142 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: irc-echoer
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Input to IRC echoer
+# Description: Input to IRC echoer
+### END INIT INFO
+
+# Author: Ryan Lane <rl...@wikimedia.org>
+#
+# Do NOT "set -e"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Input to IRC echoer"
+DAEMON="/usr/local/bin/ircecho"
+USER="nobody"
+SCRIPTNAME="/etc/init.d/ircecho"
+NAME="ircecho"
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start -m --pidfile=/var/run/ircecho.pid -b --quiet
-c $USER --exec $DAEMON --test -- --infile=$INFILE $CHANS $NICK $SERVER >
/dev/null \
+ || return 1
+ start-stop-daemon --start -m --pidfile=/var/run/ircecho.pid -b --quiet
-c $USER --exec $DAEMON -- --infile=$INFILE $CHANS $NICK $SERVER \
+ || return 2
+ # Add code here, if necessary, that waits for the process to be ready
+ # to handle requests from services started subsequently which depend
+ # on this one. As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --pidfile=/var/run/ircecho.pid --signal 9
--quiet
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+ #
+ # If the daemon can reload its configuration without
+ # restarting (for example, when it is sent a SIGHUP),
+ # then implement that here.
+ #
+ do_stop
+ do_start
+ return 0
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ 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"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ #reload|force-reload)
+ #
+ # If do_reload() is not implemented then leave this commented out
+ # and leave 'force-reload' as an alias for 'restart'.
+ #
+ #log_daemon_msg "Reloading $DESC" "$NAME"
+ #do_reload
+ #log_end_msg $?
+ #;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
--
To view, visit https://gerrit.wikimedia.org/r/405882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbc32180ee6e7418110d147413ebacdd8c306f43
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
