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 +++++++++++++ .../root-image/krebs/bin/filehooker_configure_ncdc.ship | 15 --------------- .../krebs/bin/filehooker_configure_netshare.ship | 7 ------- 4 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 Reaktor/etc/systemd/system/Reaktor.service create mode 100644 Reaktor/etc/systemd/system/Reaktor@.service delete mode 100755 filehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship delete mode 100755 filehooker/root-image/krebs/bin/filehooker_configure_netshare.ship 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 diff --git a/filehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship b/filehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship deleted file mode 100755 index 62d3b4f7..00000000 --- a/filehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env ship -#TODO waiting for ship2 -#@info -#@strict -set -euf -#@include filehooker -. /krebs/lib/filehooker - -dc_hub="adcs://elch.nsupdate.info:2781" -nick="$(cat /etc/hostname)" - -ncdc_install - -ncdc_configure_nick "$nick" -ncdc_configure_hub "$dc_hub" diff --git a/filehooker/root-image/krebs/bin/filehooker_configure_netshare.ship b/filehooker/root-image/krebs/bin/filehooker_configure_netshare.ship deleted file mode 100755 index f45ffeac..00000000 --- a/filehooker/root-image/krebs/bin/filehooker_configure_netshare.ship +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -#@info -#@strict -#@include filehooker -#for i in $(prepare_netshares) ;do - #ncdc_configure_netshare "$i" "${i##*/}" -#done -- cgit v1.2.3