Add apt config for unattended upgrades, refactor global variables a bit

7 files changed, 36 insertions, 31 deletions

diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index 3774e92..94c3b58 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -12,10 +12,13 @@ export TASKMANDIR="/opt/taskmanager/"
 export OPENSLXDIR="/opt/openslx/"
 export OPENSLXSRVDIR="/srv/openslx/"
 export LDADPDIR="/opt/ldadp/"
-export DEBIAN_FRONTEND=noninteractive			# Part of keeping apt quiet
-export LANG=en_US.UTF-8
 export SYNCDAEMONDIR="/opt/syncdaemon/"
-export SYSLINUX6DIR="/srv/openslx/tftp"
+export TFTPDIR="/srv/openslx/tftp"
+export WWWDIR="/srv/openslx/www"
+readonly LOGDIR INSTALLDIR TASKMANDIR OPENSLXDIR OPENSLXSRVDIR LDADPDIR SYNCDAEMONDIR TFTPDIR WWWDIR
+
+export DEBIAN_FRONTEND="noninteractive"			# Part of keeping apt quiet
+export LANG="en_US.UTF-8"
 
 ### Needed Packages:
 # Set list of needed packages (scripting needs) - remember, Debian-specific so far.
diff --git a/satellit_installer/includes/10-configurations.inc b/satellit_installer/includes/10-configurations.inc
index 344243b..fe00149 100644
--- a/satellit_installer/includes/10-configurations.inc
+++ b/satellit_installer/includes/10-configurations.inc
@@ -19,9 +19,6 @@ patch_atftpd_config() {
 	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 "ok."
-	echo -n "# Starting atftpd server..."
-	/etc/init.d/atftpd start 2>/dev/null 1>&2
-	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..."
 	if [ $(grep -c "^tftp.*dgram.*udp4" /etc/inetd.conf) -gt 0 ]; then
@@ -44,12 +41,8 @@ patch_lighttpd_config() {
 	cd /etc/lighttpd/conf-enabled
 	[ ! -h 10-fastcgi.conf ] && ln -s ../conf-available/10-fastcgi.conf
 	[ ! -h 15-fastcgi-php.conf ] && ln -s ../conf-available/15-fastcgi-php.conf
-	echo -n "# Starting lighttpd server..."
 	mkdir -p "$1" 2>/dev/null
-	/etc/init.d/lighttpd start 2>/dev/null 1>&2
-	cd - 1>/dev/null
-	echo "ok."
-}	
+}
 
 config_nfs() {
 	echo -n "# Patching /etc/exports for NFS... "
@@ -63,3 +56,8 @@ config_nfs() {
 	chown dmsd:images /srv/openslx/nfs
 	chmod 775 /srv/openslx/nfs
 }
+
+write_apt_config() {
+	cp "$BASEDIR/static_files/system/apt-upgrade-conf" "/etc/apt/apt.conf.d/02periodic"
+}
+
diff --git a/satellit_installer/includes/10-script_dropper.inc b/satellit_installer/includes/10-script_dropper.inc
index b43b563..578415d 100644
--- a/satellit_installer/includes/10-script_dropper.inc
+++ b/satellit_installer/includes/10-script_dropper.inc
@@ -89,7 +89,7 @@ drop_script() {
 	sed -i "s/%MYSQL_BWLEHRPOOL_PASS%/\$MYSQL_BWLEHRPOOL_NEW/g" /srv/openslx/www/vmchooser/list.php
 
 	# Patching openslx-mysql-userpass into slx-admin config:
-	sed -i "s/%MYSQL_OPENSLX_PASS%/\$MYSQL_OPENSLX_NEW/g" "$OPENSLXSRVDIR/www/slx-admin/config.php"
+	sed -i "s/%MYSQL_OPENSLX_PASS%/\$MYSQL_OPENSLX_NEW/g" "$WWWDIR/slx-admin/config.php"
 
 	# Patching debian-sys-maint password into /etc/mysql/debian.cnf:
 	sed -i "s/password = .*/password = \$MYSQL_SYSMAINT_NEW/g" "/etc/mysql/debian.cnf"
diff --git a/satellit_installer/includes/90-patch_slxadmin.inc b/satellit_installer/includes/90-patch_slxadmin.inc
index 6dcd042..ec2f476 100644
--- a/satellit_installer/includes/90-patch_slxadmin.inc
+++ b/satellit_installer/includes/90-patch_slxadmin.inc
@@ -1,18 +1,18 @@
 patch_slxadmin () {
 	# Remove translation menu entry
-	sed -i '/^.*do=Translat.*$/d' "$OPENSLXSRVDIR/www/slx-admin/templates/main-menu.html"
+	sed -i '/^.*do=Translat.*$/d' "$WWWDIR/slx-admin/templates/main-menu.html"
 	# appending a variable with satellite server build date/time to slx-admin config:
-	echo "define('CONFIG_FOOTER', 'Build time: $(date "+%Y-%m-%d %H:%m:%S")');" >> "$OPENSLXSRVDIR/www/slx-admin/config.php"
+	echo "define('CONFIG_FOOTER', 'Build time: $(date "+%Y-%m-%d %H:%m:%S")');" >> "$WWWDIR/slx-admin/config.php"
 
 	# Create redirect for /
-	cat > "$OPENSLXSRVDIR/www/index.php" <<-HIERDOCK
+	cat > "$WWWDIR/index.php" <<-HIERDOCK
 		<?php
 		Header('Location: /slx-admin/?do=Main');
 	HIERDOCK
 	# vmchooser2 vm list
-	mkdir -p "$OPENSLXSRVDIR/www/vmchooser"
-	cp "$BASEDIR/static_files/vmchooser_list.php" "$OPENSLXSRVDIR/www/vmchooser/list.php"
-	chmod 0600 "$OPENSLXSRVDIR/www/vmchooser/list.php"
-	chown www-data "$OPENSLXSRVDIR/www/vmchooser/list.php"
+	mkdir -p "$WWWDIR/vmchooser"
+	cp "$BASEDIR/static_files/vmchooser_list.php" "$WWWDIR/vmchooser/list.php"
+	chmod 0600 "$WWWDIR/vmchooser/list.php"
+	chown www-data "$WWWDIR/vmchooser/list.php"
 }
 
diff --git a/satellit_installer/includes/90-set_directory_permissions.inc b/satellit_installer/includes/90-set_directory_permissions.inc
index ec8824a..fdb2b54 100644
--- a/satellit_installer/includes/90-set_directory_permissions.inc
+++ b/satellit_installer/includes/90-set_directory_permissions.inc
@@ -23,22 +23,22 @@ set_directory_permissions() {
 	chmod 775 "$OPENSLXSRVDIR" 2>/dev/null			# if already there
 	chown -R taskmanager:root "$OPENSLXSRVDIR"
 
-	mkdir -p -m 755 "$OPENSLXSRVDIR"/www 2>/dev/null
-	chmod 755 "$OPENSLXSRVDIR"/www 2>/dev/null			# if already there
-	chown -R www-data:taskmanager "$OPENSLXSRVDIR"/www
+	mkdir -p -m 755 "$WWWDIR" 2>/dev/null
+	chmod 755 "$WWWDIR" 2>/dev/null			# if already there
+	chown -R www-data:taskmanager "$WWWDIR"
 
 	# mkdir -p -m 755 "$OPENSLXSRVDIR"/tftp/v4 2>/dev/null
 	# mkdir -p -m 755 "$OPENSLXSRVDIR"/tftp/v6 2>/dev/null
 	# chown -R taskmanager:root "$OPENSLXSRVDIR"/tftp
 
-	mkdir -p "$OPENSLXSRVDIR/www/boot"
-	chown -R taskmanager:www-data "$OPENSLXSRVDIR"/www/boot 2>/dev/null
-	chmod 755 "$OPENSLXSRVDIR"/www/boot 2>/dev/null
+	mkdir -p "$WWWDIR/boot"
+	chown -R taskmanager:www-data "$WWWDIR"/boot 2>/dev/null
+	chmod 755 "$WWWDIR"/boot 2>/dev/null
 
-	chown -R taskmanager: "$SYSLINUX6DIR"/*
+	chown -R taskmanager: "$TFTPDIR"/*
 
-	cp -p "$OPENSLXSRVDIR"/www/slx-admin/config.php.example "$OPENSLXSRVDIR"/www/slx-admin/config.php
-	chmod 600 "$OPENSLXSRVDIR"/www/slx-admin/config.php
+	cp -p "$WWWDIR"/slx-admin/config.php.example "$WWWDIR"/slx-admin/config.php
+	chmod 600 "$WWWDIR"/slx-admin/config.php
 	
 	mkdir -p -m 755 "$LDADPDIR" 2>/dev/null
 	chmod 755 "$LDADPDIR" 2>/dev/null			# if already there
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index 9e904e7..fa916a3 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -92,18 +92,20 @@ check_pureftpd_key							# check pureftp key (and gen. on if necessary)
 
 patch_atftpd_config
 
-patch_lighttpd_config "$OPENSLXSRVDIR"/www		# $1: lighttpd http root
+patch_lighttpd_config "$WWWDIR"		# $1: lighttpd http root
+
+write_apt_config
 
 install_bwSuite_server /opt/dmsd
 
 install_taskmanager /opt/taskmanager
 
 unpack_tar_gz "$BASEDIR/static_files/openslx.tar.gz" "-C $OPENSLXDIR"
-unpack_tar_gz "$BASEDIR/static_files/slx-admin.tar.gz" "-C $OPENSLXSRVDIR/www/slx-admin"
+unpack_tar_gz "$BASEDIR/static_files/slx-admin.tar.gz" "-C $WWWDIR/slx-admin"
 unpack_tar_gz "$BASEDIR/static_files/openslx_tftp.tar.gz" "-C $OPENSLXSRVDIR"
 unpack_tar_gz "$BASEDIR/static_files/ldadp.tgz" "-C $LDADPDIR"
 unpack_tar_gz "$BASEDIR/static_files/syncdaemon.tar.gz" "-C $SYNCDAEMONDIR"
-unpack_tar_gz "$BASEDIR/static_files/syslinux6.tar.gz" "-C $SYSLINUX6DIR"
+unpack_tar_gz "$BASEDIR/static_files/syslinux6.tar.gz" "-C $TFTPDIR"
 
 install_syncdaemon "$SYNCDAEMONDIR"
 
diff --git a/satellit_installer/static_files/system/apt-upgrade-conf b/satellit_installer/static_files/system/apt-upgrade-conf
new file mode 100644
index 0000000..8d6d7c8
--- /dev/null
+++ b/satellit_installer/static_files/system/apt-upgrade-conf
@@ -0,0 +1,2 @@
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Unattended-Upgrade "1";