summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Reaktor/etc/systemd/system/Reaktor.service1
-rw-r--r--Reaktor/startup/systemd/system/Reaktor.service12
-rw-r--r--filehooker/root-image/etc/systemd/system/tor-configure-hidden.service (renamed from filehooker/root-image/etc/systemd/system/tor-announce.service)4
-rwxr-xr-xfilehooker/root-image/krebs/bin/tor_configure_hidden_service.ship (renamed from filehooker/root-image/krebs/bin/tor_announce.ship)0
4 files changed, 3 insertions, 14 deletions
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
diff --git a/Reaktor/startup/systemd/system/Reaktor.service b/Reaktor/startup/systemd/system/Reaktor.service
deleted file mode 100644
index 59d0e904..00000000
--- a/Reaktor/startup/systemd/system/Reaktor.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Reaktor
-After=network.target nss-lookup.target
-
-[Service]
-Type=forking
-PIDFile=/run/ntpd.pid
-ExecStart=/krebs/Reaktor/index
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/filehooker/root-image/etc/systemd/system/tor-announce.service b/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service
index 818a5c4c..c9b8f20f 100644
--- a/filehooker/root-image/etc/systemd/system/tor-announce.service
+++ b/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service
@@ -1,11 +1,11 @@
[Unit]
Description=Announce Tor Hidden Address
-After=network.target
+After=network.target nss-lookup.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/krebs/bin/tor_announce.ship
+ExecStart=/krebs/bin/tor_configure_hidden_service.ship
[Install]
WantedBy=multi-user.target
diff --git a/filehooker/root-image/krebs/bin/tor_announce.ship b/filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship
index ec4f33b6..ec4f33b6 100755
--- a/filehooker/root-image/krebs/bin/tor_announce.ship
+++ b/filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship