From 5d087f072718776823113022960529b006bf6277 Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Tue, 18 Mar 2014 22:16:42 +0100
Subject: Reaktor: startup -> etc

---
 etc/conf.d/reaktor              |   2 +
 etc/init.d/reaktor-debian       | 102 ++++++++++++++++++++++++++++++++++++++++
 etc/supervisor/Reaktor.conf     |   6 +++
 startup/conf.d/reaktor          |   2 -
 startup/init.d/reaktor-debian   | 102 ----------------------------------------
 startup/supervisor/Reaktor.conf |   6 ---
 6 files changed, 110 insertions(+), 110 deletions(-)
 create mode 100644 etc/conf.d/reaktor
 create mode 100755 etc/init.d/reaktor-debian
 create mode 100644 etc/supervisor/Reaktor.conf
 delete mode 100644 startup/conf.d/reaktor
 delete mode 100755 startup/init.d/reaktor-debian
 delete mode 100644 startup/supervisor/Reaktor.conf

diff --git a/etc/conf.d/reaktor b/etc/conf.d/reaktor
new file mode 100644
index 0000000..a4f3f8e
--- /dev/null
+++ b/etc/conf.d/reaktor
@@ -0,0 +1,2 @@
+export target="#krebsco"
+export host="irc.freenode.com"
diff --git a/etc/init.d/reaktor-debian b/etc/init.d/reaktor-debian
new file mode 100755
index 0000000..a94384f
--- /dev/null
+++ b/etc/init.d/reaktor-debian
@@ -0,0 +1,102 @@
+#!/bin/sh
+# uses template from /etc/init.d/skeleton
+### BEGIN INIT INFO
+# Provides:          reaktor
+# Required-Start:    
+# Required-Stop:     
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: reaktor
+# Description:       starts reaktor daemon
+#                    
+### END INIT INFO
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+NAME=reaktor
+USER=reaktor
+DESC="$NAME daemon"
+DAEMON=/usr/bin/python
+DAEMON_DIR="/krebs/Reaktor/IRC/"
+DAEMON_ARGS="${DAEMON_DIR}/asybot.py"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+[ -x "$DAEMON" ] || exit 0
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+. /lib/init/vars.sh
+. /lib/lsb/init-functions
+
+do_start()
+{
+  #   0 if daemon has been started
+  #   1 if daemon was already running
+  #   2 if daemon could not be started
+  start-stop-daemon -b -d $DAEMON_DIR/.. -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+          || return 1
+  start-stop-daemon -b -d $DAEMON_DIR/.. -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
+      $DAEMON_ARGS \
+      || return 2
+}
+
+do_stop()
+{
+  #   0 if daemon has been stopped
+  #   1 if daemon was already stopped
+  #   2 if daemon could not be stopped
+  start-stop-daemon --stop --retry=TERM/30/KILL/5 --pidfile $PIDFILE
+  RETVAL="$?"
+  [ "$RETVAL" = 2 ] && return 2
+  rm -f $PIDFILE
+  return "$RETVAL"
+}
+
+do_reload() {
+  start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
+  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 $?
+       ;;
+  restart|force-reload)
+  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 ;;
+          *) log_end_msg 1 ;;
+      esac
+      ;;
+    *)
+      # Failed to stop
+      log_end_msg 1
+      ;;
+  esac
+  ;;
+  *)
+  echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+  exit 3
+  ;;
+esac
+
+:
diff --git a/etc/supervisor/Reaktor.conf b/etc/supervisor/Reaktor.conf
new file mode 100644
index 0000000..497066e
--- /dev/null
+++ b/etc/supervisor/Reaktor.conf
@@ -0,0 +1,6 @@
+[program:Reaktor]
+command=/usr/bin/python2.6 IRC/asybot.py
+environment=host='irc.freenode.net',target='#krebsco' 
+redirect_stderr=true
+user=reaktor
+directory=/krebs/Reaktor
diff --git a/startup/conf.d/reaktor b/startup/conf.d/reaktor
deleted file mode 100644
index a4f3f8e..0000000
--- a/startup/conf.d/reaktor
+++ /dev/null
@@ -1,2 +0,0 @@
-export target="#krebsco"
-export host="irc.freenode.com"
diff --git a/startup/init.d/reaktor-debian b/startup/init.d/reaktor-debian
deleted file mode 100755
index a94384f..0000000
--- a/startup/init.d/reaktor-debian
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-# uses template from /etc/init.d/skeleton
-### BEGIN INIT INFO
-# Provides:          reaktor
-# Required-Start:    
-# Required-Stop:     
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: reaktor
-# Description:       starts reaktor daemon
-#                    
-### END INIT INFO
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-NAME=reaktor
-USER=reaktor
-DESC="$NAME daemon"
-DAEMON=/usr/bin/python
-DAEMON_DIR="/krebs/Reaktor/IRC/"
-DAEMON_ARGS="${DAEMON_DIR}/asybot.py"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-[ -x "$DAEMON" ] || exit 0
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-. /lib/init/vars.sh
-. /lib/lsb/init-functions
-
-do_start()
-{
-  #   0 if daemon has been started
-  #   1 if daemon was already running
-  #   2 if daemon could not be started
-  start-stop-daemon -b -d $DAEMON_DIR/.. -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-          || return 1
-  start-stop-daemon -b -d $DAEMON_DIR/.. -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
-      $DAEMON_ARGS \
-      || return 2
-}
-
-do_stop()
-{
-  #   0 if daemon has been stopped
-  #   1 if daemon was already stopped
-  #   2 if daemon could not be stopped
-  start-stop-daemon --stop --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-  RETVAL="$?"
-  [ "$RETVAL" = 2 ] && return 2
-  rm -f $PIDFILE
-  return "$RETVAL"
-}
-
-do_reload() {
-  start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
-  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 $?
-       ;;
-  restart|force-reload)
-  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 ;;
-          *) log_end_msg 1 ;;
-      esac
-      ;;
-    *)
-      # Failed to stop
-      log_end_msg 1
-      ;;
-  esac
-  ;;
-  *)
-  echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-  exit 3
-  ;;
-esac
-
-:
diff --git a/startup/supervisor/Reaktor.conf b/startup/supervisor/Reaktor.conf
deleted file mode 100644
index 497066e..0000000
--- a/startup/supervisor/Reaktor.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[program:Reaktor]
-command=/usr/bin/python2.6 IRC/asybot.py
-environment=host='irc.freenode.net',target='#krebsco' 
-redirect_stderr=true
-user=reaktor
-directory=/krebs/Reaktor
-- 
cgit v1.2.3