[SSPS] Add TODO for compiling dnbd3-server, add alt-servers

1 files changed, 10 insertions, 14 deletions

diff --git a/satellit_installer/includes/50-install_dnbd3-server.inc b/satellit_installer/includes/50-install_dnbd3-server.inc
index 86deb5a..25d5ba6 100644
--- a/satellit_installer/includes/50-install_dnbd3-server.inc
+++ b/satellit_installer/includes/50-install_dnbd3-server.inc
@@ -4,6 +4,7 @@ install_dnbd3-server_service() {
 	echo "# Linking dnbd3-server service file into (/etc/systemd/system/)multi-user.target.wants..."
 	ln -s /etc/systemd/system/dnbd3-server.service /etc/systemd/system/multi-user.target.wants/dnbd3-server.service \
 		|| perror "Could not link dnbd3-server service file into multiuser target!"
+	# For accessing stage4 on master server via SSL tunnel
 	echo "# copying dnbd3-master-proxy service file..."
 	cp -p "$BASEDIR/static_files/dnbd3/dnbd3-master-proxy.service" /etc/systemd/system/dnbd3-master-proxy.service || perror "failed."
 	echo "# Linking dnbd3-master-proxy service file into (/etc/systemd/system/)multi-user.target.wants..."
@@ -14,26 +15,21 @@ install_dnbd3-server_service() {
 install_dnbd3-server() {
 	# $1: directory to install dnbd3-server to
 	echo "# Installing dnbd3 server... "
-	mkdir -p "$1" || perror "mkdir $1 failed"
-
-	# Quick&dirty fix: dnbd3-server is downloaded via get_files_http, which dumps 
-	# the files into $BASEDIR/static_files, not into $BASEDIR/static_files/dnbd3.
-	mv "$BASEDIR/static_files/dnbd3-server" "$BASEDIR/static_files/dnbd3/" \
-		|| perror "could not move dnbd3-server to static_files/dnbd3 (quickfix)."
-
-	for i in dnbd3-server is-enabled; do
-		cp -p "$BASEDIR/static_files/dnbd3/$i" "$1/$i" \
-			|| perror "Could not copy $i to $1"
-		chmod +x "$1/$i"
-	done
-	chown -R root:root "$1"
+	mkdir -p "$1" || perror "mkdir '$1' failed"
+	# TODO XXX
+	# We need to switch to compiling dnbd3-server here
+	# instead of downloading the binary.
+	# (Will require libjansson-dev)
+	perror "Not implemented!"
 
+	# Copy config files
 	mkdir -p /etc/dnbd3-server || perror "mkdir /etc/dnbd3-server failed"
-	for i in rpc.acl server.conf; do
+	for i in rpc.acl server.conf alt-servers; do
 		cp -p "$BASEDIR/static_files/dnbd3/$i" "/etc/dnbd3-server/$i" \
 			|| perror "Could not copy $i to /etc/dnbd3-server"
 		chmod 644 "/etc/dnbd3-server/$i"
 	done
+	chown -R root:root "$1"
 
 	install_dnbd3-server_service "/etc/systemd/system/"
 	echo "# dnbd3-server ok."