From 635beafca55b9c90e9b1a47af8806236be7c110b Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 18 Mar 2014 22:16:42 +0100 Subject: Reaktor: startup -> etc --- Reaktor/etc/conf.d/reaktor | 2 + Reaktor/etc/init.d/reaktor-debian | 102 ++++++++++++++++++++++++++++++++++++ Reaktor/etc/supervisor/Reaktor.conf | 6 +++ 3 files changed, 110 insertions(+) create mode 100644 Reaktor/etc/conf.d/reaktor create mode 100755 Reaktor/etc/init.d/reaktor-debian create mode 100644 Reaktor/etc/supervisor/Reaktor.conf (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/conf.d/reaktor b/Reaktor/etc/conf.d/reaktor new file mode 100644 index 00000000..a4f3f8e1 --- /dev/null +++ b/Reaktor/etc/conf.d/reaktor @@ -0,0 +1,2 @@ +export target="#krebsco" +export host="irc.freenode.com" diff --git a/Reaktor/etc/init.d/reaktor-debian b/Reaktor/etc/init.d/reaktor-debian new file mode 100755 index 00000000..a94384f4 --- /dev/null +++ b/Reaktor/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/Reaktor/etc/supervisor/Reaktor.conf b/Reaktor/etc/supervisor/Reaktor.conf new file mode 100644 index 00000000..497066e9 --- /dev/null +++ b/Reaktor/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 -- cgit v1.2.3 From 053f6869c91db84dd7c6d1a88e83dc4899e6fb0b Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Mar 2014 11:36:55 +0100 Subject: add systemd config --- Reaktor/etc/systemd/system/Reaktor.service | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Reaktor/etc/systemd/system/Reaktor.service (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/systemd/system/Reaktor.service b/Reaktor/etc/systemd/system/Reaktor.service new file mode 100644 index 00000000..e9a11d8e --- /dev/null +++ b/Reaktor/etc/systemd/system/Reaktor.service @@ -0,0 +1,11 @@ +[Unit] +Description=Reaktor +After=network.target nss-lookup.target + +[Service] +Type=forking +ExecStart=/krebs/painload/Reaktor/index +Restart=always + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3 From 598fa5aa39d812a572c09d8552a653357d7dd510 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Mar 2014 11:44:17 +0100 Subject: Reaktor:systemd for users --- Reaktor/etc/systemd/system/Reaktor.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/systemd/system/Reaktor.service b/Reaktor/etc/systemd/system/Reaktor.service index e9a11d8e..c3dc2f78 100644 --- a/Reaktor/etc/systemd/system/Reaktor.service +++ b/Reaktor/etc/systemd/system/Reaktor.service @@ -1,9 +1,10 @@ [Unit] -Description=Reaktor +Description=Reaktor for user %i After=network.target nss-lookup.target [Service] Type=forking +User=%i ExecStart=/krebs/painload/Reaktor/index Restart=always -- cgit v1.2.3 From d54b633fa363f4c04c77369b1add4c9120dbbba0 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Mar 2014 12:23:31 +0100 Subject: filehooker: tor is only configured, not published --- Reaktor/etc/systemd/system/Reaktor.service | 1 + 1 file changed, 1 insertion(+) (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/systemd/system/Reaktor.service b/Reaktor/etc/systemd/system/Reaktor.service index c3dc2f78..04786302 100644 --- a/Reaktor/etc/systemd/system/Reaktor.service +++ b/Reaktor/etc/systemd/system/Reaktor.service @@ -4,6 +4,7 @@ After=network.target nss-lookup.target [Service] Type=forking +#TODO - make reaktor path variable User=%i ExecStart=/krebs/painload/Reaktor/index Restart=always -- cgit v1.2.3 From 9acc67ee5d32dff4c6c3485a4ee4910b0be1dad4 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Mar 2014 19:22:01 +0100 Subject: Reaktor: Reaktor.service -> Reaktor@ --- Reaktor/etc/systemd/system/Reaktor.service | 13 ------------- Reaktor/etc/systemd/system/Reaktor@.service | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 Reaktor/etc/systemd/system/Reaktor.service create mode 100644 Reaktor/etc/systemd/system/Reaktor@.service (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/systemd/system/Reaktor.service b/Reaktor/etc/systemd/system/Reaktor.service deleted file mode 100644 index 04786302..00000000 --- a/Reaktor/etc/systemd/system/Reaktor.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Reaktor for user %i -After=network.target nss-lookup.target - -[Service] -Type=forking -#TODO - make reaktor path variable -User=%i -ExecStart=/krebs/painload/Reaktor/index -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/Reaktor/etc/systemd/system/Reaktor@.service b/Reaktor/etc/systemd/system/Reaktor@.service new file mode 100644 index 00000000..04786302 --- /dev/null +++ b/Reaktor/etc/systemd/system/Reaktor@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Reaktor for user %i +After=network.target nss-lookup.target + +[Service] +Type=forking +#TODO - make reaktor path variable +User=%i +ExecStart=/krebs/painload/Reaktor/index +Restart=always + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3 From d041405044765ff8da8932d613c8ac3be37dd765 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Mar 2014 20:51:52 +0100 Subject: fix reaktor systemd startup --- Reaktor/etc/systemd/system/Reaktor@.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/systemd/system/Reaktor@.service b/Reaktor/etc/systemd/system/Reaktor@.service index 04786302..ad2a9d91 100644 --- a/Reaktor/etc/systemd/system/Reaktor@.service +++ b/Reaktor/etc/systemd/system/Reaktor@.service @@ -3,7 +3,7 @@ Description=Reaktor for user %i After=network.target nss-lookup.target [Service] -Type=forking +Type=normal #TODO - make reaktor path variable User=%i ExecStart=/krebs/painload/Reaktor/index -- cgit v1.2.3 From aa8ca43e7bb2aef9134b227c24c473eda0615a4e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 21 Mar 2014 23:47:03 +0100 Subject: filehooker:lib/filehooker chown shares after mount --- Reaktor/etc/systemd/system/Reaktor@.service | 1 + 1 file changed, 1 insertion(+) (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/systemd/system/Reaktor@.service b/Reaktor/etc/systemd/system/Reaktor@.service index ad2a9d91..565368b3 100644 --- a/Reaktor/etc/systemd/system/Reaktor@.service +++ b/Reaktor/etc/systemd/system/Reaktor@.service @@ -8,6 +8,7 @@ Type=normal User=%i ExecStart=/krebs/painload/Reaktor/index Restart=always +RestartSec=3 [Install] WantedBy=multi-user.target -- cgit v1.2.3 From adffcc9053665c52029cb96746ce28d9f334d18a Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 27 Apr 2014 18:17:00 +0200 Subject: make systemd Reaktor file less variable --- Reaktor/etc/systemd/system/Reaktor.service | 14 ++++++++++++++ Reaktor/etc/systemd/system/Reaktor@.service | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 Reaktor/etc/systemd/system/Reaktor.service delete mode 100644 Reaktor/etc/systemd/system/Reaktor@.service (limited to 'Reaktor/etc') diff --git a/Reaktor/etc/systemd/system/Reaktor.service b/Reaktor/etc/systemd/system/Reaktor.service new file mode 100644 index 00000000..6bb3e550 --- /dev/null +++ b/Reaktor/etc/systemd/system/Reaktor.service @@ -0,0 +1,14 @@ +[Unit] +Description=Reaktor for user %i +After=network.target nss-lookup.target + +[Service] +Type=normal +#TODO - make reaktor path variable +User=reaktor +ExecStart=/krebs/painload/Reaktor/index +Restart=always +RestartSec=3 + +[Install] +WantedBy=multi-user.target diff --git a/Reaktor/etc/systemd/system/Reaktor@.service b/Reaktor/etc/systemd/system/Reaktor@.service deleted file mode 100644 index 565368b3..00000000 --- a/Reaktor/etc/systemd/system/Reaktor@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Reaktor for user %i -After=network.target nss-lookup.target - -[Service] -Type=normal -#TODO - make reaktor path variable -User=%i -ExecStart=/krebs/painload/Reaktor/index -Restart=always -RestartSec=3 - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3