summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2015-05-08 16:45:55 +0200
committerSimon Rettberg2015-05-08 16:45:55 +0200
commitff1d315ded71a4ca9e2be9a4e0188a69e322f386 (patch)
tree0d57a8de956a290d5c2d1f087b087db4ce2edb1b
parent[SSPS] Patch ldap.conf for ldapsearch (diff)
downloadsetup-scripts-ff1d315ded71a4ca9e2be9a4e0188a69e322f386.tar.gz
setup-scripts-ff1d315ded71a4ca9e2be9a4e0188a69e322f386.tar.xz
setup-scripts-ff1d315ded71a4ca9e2be9a4e0188a69e322f386.zip
[SSPS] Add ldadp compile and install logic
-rw-r--r--satellit_installer/includes/00-variables.inc3
-rw-r--r--satellit_installer/includes/50-install_ldadp.inc15
-rwxr-xr-xsatellit_installer/satellit_installer3
3 files changed, 19 insertions, 2 deletions
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index bcc8698..02e4a84 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -22,6 +22,7 @@ PACKAGELIST_SERVER="
mysql-server lighttpd pure-ftpd-mysql atftpd php5-cgi php5-curl cifs-utils
sudo php5-common php5-mysqlnd php5-cli nfs-kernel-server curl
nfs-common libowfat0 ldap-utils vim gcc make unattended-upgrades gnupg
+ libowfat-dev libssl-dev gcc make
"
# Enter here packages needing installation of recommended packages as determines by apt-get:
@@ -32,6 +33,6 @@ PACKAGELIST_WITH_RECOMMENDS="
### http for static files:
HTTP_BASE="http://files.bwlp.ks.uni-freiburg.de/install/"
-HTTP_FILES="bwLehrpoolSuite_Server.jar db_openslx_dump.sql ldadp.tgz openslx_tftp.tar.gz"
+HTTP_FILES="bwLehrpoolSuite_Server.jar db_openslx_dump.sql openslx_tftp.tar.gz"
HTTP_FILES+=" taskmanager.tar.gz db_bwLehrpool_dump.sql ftp-config.tar.gz openslx.tar.gz"
HTTP_FILES+=" slx-admin.tar.gz syncdaemon.tar.gz syslinux6.tar.gz syslinux4.tar.gz"
diff --git a/satellit_installer/includes/50-install_ldadp.inc b/satellit_installer/includes/50-install_ldadp.inc
new file mode 100644
index 0000000..9dc4847
--- /dev/null
+++ b/satellit_installer/includes/50-install_ldadp.inc
@@ -0,0 +1,15 @@
+install_ldadp() {
+ # $1: directory to install server to
+ local DIR="$1"
+ [ -z "$DIR" ] && perror "Pass dir to install_ldadp!"
+ echo "# Installing ldadp... "
+ git clone --depth 1 git://git.openslx.org/openslx-ng/ldadp.git ldadptmp || perror "Could not clone ldadp repo"
+ cd ldadptmp || perror "Could not cd to ldadptmp"
+ make || perror "Could not compile ldadp"
+ mkdir -p "$DIR" || perror "Could not create $DIR"
+ cp ldadp "$DIR" || perror "Could not copy ldadp binary to $DIR"
+ cd .. || perror "Could not cd .."
+ rm -r ldadptmp # Should we care if fail?
+ return 0
+}
+
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index 34a019d..4b085dc 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -126,13 +126,14 @@ 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 $WWWDIR/slx-admin"
-unpack_tar_gz "$BASEDIR/static_files/ldadp.tgz" "-C $LDADPDIR"
unpack_tar_gz "$BASEDIR/static_files/openslx_tftp.tar.gz" "-C $TFTPDIR"
unpack_tar_gz "$BASEDIR/static_files/syslinux4.tar.gz" "-C $TFTPDIR/v4"
unpack_tar_gz "$BASEDIR/static_files/syslinux6.tar.gz" "-C $TFTPDIR/v6"
install_syncdaemon "$SYNCDAEMONDIR"
+install_ldadp "$LDADPDIR" || perror "Could not install ldadp"
+
# NFS server configuration:
config_nfs