[SSPS] Cleanup, disable lighttpd

1 files changed, 17 insertions, 13 deletions

diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index 9676f48..ac87479 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -63,23 +63,22 @@ export BASEDIR="$(dirname "${SELF}")"
 #
 
 # First, to include includes include them:
-echo -n "# Sourcing includes: "
+echo "# Sourcing includes"
 for INCLUDE in "$BASEDIR"/includes/*.inc; do
-	echo -n "."
 	source "$INCLUDE"
 done
-echo " ok"
 
 ####### Main program #######
 
-system_upgrade					# No harm done even if not necessary
- 
-install_packages "$PACKAGELIST_SCRIPT"		# Packages needed for script
- 
+# No harm done even if not necessary
+system_upgrade
+
+# Packages needed for script
+install_packages NOREC "$PACKAGELIST_SCRIPT"
+
 # Then, let's download the needed helper files to static_files, as there
 # is no sense in commencing if one of these files is missing.
-get_files_http
-[ "${ERR}" -ne 0 ] && exit 1
+get_files_http || exit 1
 
 # until pump is available again:
 # setup_dhcp					# dhcp: no dhclient but pump
@@ -90,10 +89,15 @@ prerequisites					# config directory, locales
 
 set_version_string				# Writing version string for rc.local-script
 
-install_packages NOREC "$PACKAGELIST_SERVER"		# Packages needed for server installable without
-							# recommended packages, so option NOREC is set.
-install_packages RECOM "$PACKAGELIST_WITH_RECOMMENDS"	# Packages where installation of recommended
-							# packages is necessary, so opt. RECOM is set.
+# Packages needed for server installable without
+# recommended packages, so option NOREC is set.
+install_packages NOREC "$PACKAGELIST_SERVER"
+# Packages where installation of recommended
+# packages is necessary, so opt. RECOM is set.
+install_packages RECOM "$PACKAGELIST_WITH_RECOMMENDS"
+
+# We only want this running once the user logged in via ssh/tty
+systemctl disable lighttpd.service
 
 kill_existing_users    # delete all users uid >= 1000