[SSPS] No more atftpd, now tftpd-hpa gets installed

1 files changed, 17 insertions, 12 deletions

diff --git a/satellit_installer/includes/10-configurations.inc b/satellit_installer/includes/10-configurations.inc
index f9072e0..fdd9d61 100644
--- a/satellit_installer/includes/10-configurations.inc
+++ b/satellit_installer/includes/10-configurations.inc
@@ -1,11 +1,16 @@
-patch_atftpd_config() {
-	echo -n "# Stopping atftpd server in case it's not managed by inetd... "
-	[ "$SYSTEMD" ] && systemctl stop atftpd || /etc/init.d/atftpd stop 2>/dev/null 1>&2
+patch_tftpd-hpa_config() {
+	echo -n "# Stopping tftpd-hpa server in case it's not managed by inetd... "
+	[ "$SYSTEMD" ] && systemctl stop tftpd-hpa || /etc/init.d/tftpd-hpa stop 2>/dev/null 1>&2
 	echo "ok."
 	# No sense in patching, we will drop this little entry.
-	echo -n "# Patching atftpd configuration... "
-	echo "USE_INETD=false"	> /etc/default/atftpd
-	echo 'OPTIONS="--retry-timeout 1 --maxthread 100 --verbose=5 --no-multicast --bind-address 0.0.0.0 /srv/openslx/tftp"' >> /etc/default/atftpd
+	echo -n "# Patching tftpd-hpa configuration... "
+	cat <<- HEREDOC > /etc/default/tftpd-hpa
+		# /etc/default/tftpd-hpa
+		TFTP_USERNAME="tftp"
+		TFTP_DIRECTORY="/srv/openslx/tftp"
+		TFTP_ADDRESS="0.0.0.0:69"
+		TFTP_OPTIONS="--secure"
+	HEREDOC
 	echo "ok."
 	# sometimes a tftp stating line remains in /etc/inetd.conf. Let's have a look and kill this interesting line:
 	echo -n "# Checking /etc/inetd.conf for a tftp entry... "
@@ -22,12 +27,12 @@ patch_atftpd_config() {
 	fi	
 }
 
-copy_atftpd_service() {
-	echo -n "# Copying atftpd service file... "
-	cp -p "$BASEDIR/static_files/atftpd.service" /etc/systemd/system && echo "ok." || perror "failed."
-	echo -n "# Linking atftpd service file into (/etc/systemd/system/)multi-user.target.wants... "
-	ln -s /etc/systemd/system/atftpd.service /etc/systemd/system/multi-user.target.wants/atftpd.service \
-		&& echo "ok." || perror "Could not link atftpd service file into multiuser target!"
+copy_tftpd-hpa_service() {
+	echo -n "# Copying tftpd-hpa service file... "
+	cp -p "$BASEDIR/static_files/tftpd-hpa.service" /etc/systemd/system && echo "ok." || perror "failed."
+	echo -n "# Linking tftpd-hpa service file into (/etc/systemd/system/)multi-user.target.wants... "
+	ln -s /etc/systemd/system/tftpd-hpa.service /etc/systemd/system/multi-user.target.wants/tftpd-hpa.service \
+		&& echo "ok." || perror "Could not link tftpd-hpa service file into multiuser target!"
 }
 
 patch_lighttpd_config() {