From fdc0eb30101d1505ac5ce674a18a14869f3105d0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sun, 19 Oct 2014 20:37:55 +0200
Subject: Add apt config for unattended upgrades, refactor global variables a
 bit

---
 satellit_installer/satellit_installer | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'satellit_installer/satellit_installer')

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"
 
-- 
cgit v1.2.3-55-g7522