[SSPS] Kill dup files; move tftpd files around

6 files changed, 6 insertions, 63 deletions

diff --git a/satellit_installer/static_files/dnbd3-server.service b/satellit_installer/static_files/dnbd3-server.service
deleted file mode 100644
index e623e08..0000000
--- a/satellit_installer/static_files/dnbd3-server.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=DNBD3 Server
-ConditionPathExists=!/srv/openslx/nfs/.notmounted
-
-[Service]
-User=dnbd3
-PermissionsStartOnly=true
-ExecStartPre=/opt/openslx/dnbd3/is-enabled
-ExecStart=/opt/openslx/dnbd3/dnbd3-server -n
-Restart=always
-RestartSec=5
-TimeoutStopSec=10
-
diff --git a/satellit_installer/static_files/is-enabled b/satellit_installer/static_files/is-enabled
deleted file mode 100755
index 11d1fb0..0000000
--- a/satellit_installer/static_files/is-enabled
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Run as root!
-# Check if dnbd3 is configured active in slx-admin
-# If not, stop service and bail out, otherwise exit 0 to
-# signal systemd that the daemon should start.
-# Retry a couple of times if slx-admin returns
-# neither YES nor NO
-
-for i in 1 2 3 4 END; do
-	RET=$(curl -m 3 -s 'http://127.0.0.1/slx-admin/api.php?do=dnbd3&get=enabled')
-	[ "$RET" = "YES" ] && exit 0
-	if [ "$RET" = "NO" ]; then
-		systemctl stop dnbd3-server.service
-		exit 1
-	fi
-	[ "$i" = "END" ] && break
-	sleep "$i"
-done
-
-exit 2
-
diff --git a/satellit_installer/static_files/rpc.acl b/satellit_installer/static_files/rpc.acl
deleted file mode 100644
index 576757c..0000000
--- a/satellit_installer/static_files/rpc.acl
+++ /dev/null
@@ -1,2 +0,0 @@
-# Everything from localhost
-127.0.0.0/8 ALL
diff --git a/satellit_installer/static_files/server.conf b/satellit_installer/static_files/server.conf
deleted file mode 100644
index 404e4ff..0000000
--- a/satellit_installer/static_files/server.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-[dnbd3]
-listenPort=5003
-basePath=/srv/openslx/nfs
-serverPenalty=0
-clientPenalty=1000
-isProxy=false
-removeMissingImages=true
-clientTimeout=15000
-vmdkLegacyMode=true
-closeUnusedFd=true
-
-; Log related config
-[logging]
-; protip: use SIGUSR2 to reopen log file
-; DEACTIVATED
-;;file=./dnbd3.log
-fileMask=ERROR WARNING MINOR INFO DEBUG1
-consoleMask=ERROR WARNING MINOR INFO
-; Valid types (warning: specifying invalid types will not yield an error!)
-; ERROR     Fatal error, server will terminate
-; WARNING   Major issue, something is broken but keep running
-; MINOR     Minor issue, more of a hickup than serious problem
-; INFO      Informational message
-; DEBUG1    Debug information, used for medium verbosity
-; DEBUG2    Used for debug messages that would show up a lot
-
diff --git a/satellit_installer/static_files/tftpd/tftpd-hpa b/satellit_installer/static_files/tftpd/tftpd-hpa
new file mode 100644
index 0000000..1e4589b
--- /dev/null
+++ b/satellit_installer/static_files/tftpd/tftpd-hpa
@@ -0,0 +1,6 @@
+# /etc/default/tftpd-hpa
+
+TFTP_USERNAME="tftp"
+TFTP_DIRECTORY="/srv/openslx/tftp"
+TFTP_ADDRESS="0.0.0.0:69"
+TFTP_OPTIONS="--secure"
diff --git a/satellit_installer/static_files/tftpd-hpa.service b/satellit_installer/static_files/tftpd/tftpd-hpa.service
index 2bf6a3a..2bf6a3a 100644
--- a/satellit_installer/static_files/tftpd-hpa.service
+++ b/satellit_installer/static_files/tftpd/tftpd-hpa.service