add bonusfeatures to reaktor

4 files changed, 9 insertions, 5 deletions

diff --git a/filehooker/root-image/etc/systemd/system/start-ncdc@.service b/filehooker/root-image/etc/systemd/system/start-ncdc@.service
index 2c897126..1189be0f 100644
--- a/filehooker/root-image/etc/systemd/system/start-ncdc@.service
+++ b/filehooker/root-image/etc/systemd/system/start-ncdc@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=ncdc autoconfig and startup for %i
-Requires=network.target local-fs.target
+After=network.target local-fs.target multi-user.target filehooker-hostname.service
 
 [Service]
 Type=oneshot
diff --git a/filehooker/root-image/krebs/etc/Reaktor/commands/ips b/filehooker/root-image/krebs/etc/Reaktor/commands/ips
index 049d0a9d..17c39658 100755
--- a/filehooker/root-image/krebs/etc/Reaktor/commands/ips
+++ b/filehooker/root-image/krebs/etc/Reaktor/commands/ips
@@ -1,3 +1,2 @@
 #!/bin/sh
-ip addr | grep 'inet ' | awk '{print $2}' |  grep -v 127.0.0.1
-
+ip addr | grep 'inet ' | awk '{print $2}' |  grep -v 127.0.0.1 | grep .
diff --git a/filehooker/root-image/krebs/etc/Reaktor/commands/reboot b/filehooker/root-image/krebs/etc/Reaktor/commands/reboot
new file mode 100755
index 00000000..a264831a
--- /dev/null
+++ b/filehooker/root-image/krebs/etc/Reaktor/commands/reboot
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "system is going down"
+sudo /usr/bin/reboot
diff --git a/filehooker/root-image/krebs/etc/Reaktor/config.py b/filehooker/root-image/krebs/etc/Reaktor/config.py
index bc19dafc..5e07b659 100644
--- a/filehooker/root-image/krebs/etc/Reaktor/config.py
+++ b/filehooker/root-image/krebs/etc/Reaktor/config.py
@@ -8,7 +8,8 @@ irc_alarm_timeout = 300
 irc_hammer_interval = 10
 irc_kill_timeout = 360
 irc_nickname = name
-irc_server = 'irc.freenode.org'
+#irc_server = 'elchirc.nsupdate.info'
+irc_server = 'irc.freenode.net'
 irc_restart_timeout = 5
 irc_port = 6667
 irc_channels = [
@@ -54,5 +55,6 @@ commands = [
   default_command('reload'),
   default_command('update-search'),
   default_command('refresh_shares'),
-  default_command('ftpget')
+  default_command('ftpget'),
+  default_command('reboot')
 ]