From 590337299f6934df964f01feb4321e4ac3d160b6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 May 2021 17:49:27 +0200
Subject: [SSPS] Turn lists into sorted one-per-line lists

---
 satellit_installer/includes/00-variables.inc | 110 +++++++++++++++++++++++----
 1 file changed, 94 insertions(+), 16 deletions(-)

diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index d9a3047..1ec1eeb 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -11,7 +11,10 @@ export LANG="en_US.UTF-8"
 
 ### Needed Packages:
 # Set list of needed packages (scripting needs) - remember, Debian-specific so far.
-PACKAGELIST_SCRIPT="cracklib-runtime wget"
+PACKAGELIST_SCRIPT="
+	cracklib-runtime
+	wget
+"
 
 # Set list of needed packages (server needs) - remember, Debian-specific so far.
 # Keep in mind we use for standard installing of these packages the apt-get install
@@ -19,31 +22,106 @@ PACKAGELIST_SCRIPT="cracklib-runtime wget"
 # lithe and lean. So, if you add a package here make sure it installs using these options.
 # If this is not the case or in doubt use PACKAGELIST_WITH_RECOMMENDS below.
 PACKAGELIST_SERVER="
-	default-mysql-server lighttpd lighttpd-mod-deflate lighttpd-mod-openssl
-	php-cgi php-curl cifs-utils php-mbstring
-	sudo php-common php-mysql php-cli nfs-kernel-server curl
-	nfs-common libowfat0 ldap-utils vim gcc make unattended-upgrades gnupg
-	libowfat-dev libssl-dev liblzma-dev tftpd-hpa tmate php-xml net-tools
-	libjansson4 libjansson-dev php-soap mtools socat cmake
+	cifs-utils
+	cmake
+	curl
+	default-mysql-server
+	gcc
+	gnupg
+	ldap-utils
+	libjansson-dev
+	libjansson4
+	liblzma-dev
+	libowfat-dev
+	libowfat0
+	libssl-dev
+	lighttpd
+	lighttpd-mod-deflate
+	lighttpd-mod-openssl
+	make
+	mtools
+	net-tools
+	nfs-common
+	nfs-kernel-server
+	php-cgi
+	php-cli
+	php-common
+	php-curl
+	php-mbstring
+	php-mysql
+	php-soap
+	php-xml
+	socat
+	sudo
 	syslinux
+	tftpd-hpa
+	tmate
+	unattended-upgrades
+	vim
 "
 
 # Enter here packages needing installation of recommended packages as determines by apt-get:
 PACKAGELIST_WITH_RECOMMENDS="
-	openjdk-11-jre-headless open-vm-tools
+	open-vm-tools
+	openjdk-11-jre-headless
 "
 # (java simply fails otherwise, open-vm-tools needs recommended packages for its kernel modules)
 
 ### http for static files:
 HTTP_BASE="http://files.bwlp.ks.uni-freiburg.de/install/"
-HTTP_FILES="dmsd.jar openslx_tftp.tar.gz"
-HTTP_FILES+=" taskmanager.tar.gz db_sat_dump.sql"
-HTTP_FILES+=" slx-admin.tar.gz pxelinux.0"
+HTTP_FILES="
+	db_sat_dump.sql
+	dmsd.jar
+	openslx_tftp.tar.gz
+	pxelinux.0
+	slx-admin.tar.gz
+	taskmanager.tar.gz
+"
 
 ### slxadmin module list: which modules from modules-available will be (symbolically) linked:
-SLXADMIN_MODULES="adduser backup baseconfig baseconfig_bwidm baseconfig_bwlp bootstrap_datepicker bootstrap_dialog bootstrap_timepicker"
-SLXADMIN_MODULES+=" bootstrap_multiselect bootstrap_switch dnbd3 dozmod eventlog exams js_chart js_circles js_jqueryui js_moment"
-SLXADMIN_MODULES+=" js_selectize js_stupidtable js_vis js_weekcalendar locationinfo locations main minilinux news permissionmanager"
-SLXADMIN_MODULES+=" serversetup-bwlp-ipxe rebootcontrol remoteaccess roomplanner runmode session statistics statistics_reporting summernote sysconfig"
-SLXADMIN_MODULES+=" syslog systemstatus vmstore webinterface js_ip"
+SLXADMIN_MODULES="
+	adduser
+	backup
+	baseconfig
+	baseconfig_bwidm
+	baseconfig_bwlp
+	bootstrap_datepicker
+	bootstrap_dialog
+	bootstrap_multiselect
+	bootstrap_switch
+	bootstrap_timepicker
+	dnbd3
+	dozmod
+	eventlog
+	exams
+	js_chart
+	js_circles
+	js_ip
+	js_jqueryui
+	js_moment
+	js_selectize
+	js_stupidtable
+	js_vis
+	js_weekcalendar
+	locationinfo
+	locations
+	main
+	minilinux
+	news
+	permissionmanager
+	rebootcontrol
+	remoteaccess
+	roomplanner
+	runmode
+	serversetup-bwlp-ipxe
+	session
+	statistics
+	statistics_reporting
+	summernote
+	sysconfig
+	syslog
+	systemstatus
+	vmstore
+	webinterface
+"
 
-- 
cgit v1.2.3-55-g7522