X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;fp=build.sh;h=f9df9bc8815a9f5f9382d74853f8fedd7bdd9c83;hb=bb4b0af7f5c3b030d74f22021e5c3cc20ad17fe1;hp=411111c8be926f45ce3b304662b3e6f486d14081;hpb=80bdfcc459cc296a434306ce2cfd5a52ea3cd14a;p=bootmanager.git

diff --git a/build.sh b/build.sh
index 411111c..f9df9bc 100755
--- a/build.sh
+++ b/build.sh
@@ -11,49 +11,72 @@
 # Copyright (C) 2004-2007 The Trustees of Princeton University
 #
 # $Id: build.sh,v 1.5 2006/04/03 19:40:55 mlhuang Exp $
+# $URL$
 #
 
 # Source PLC configuration
-if [ -f /etc/planetlab/plc_config ] ; then
-    . /etc/planetlab/plc_config
-else
-    PLC_BOOT_HOST=boot.planet-lab.org
-    PLC_API_HOST=www.planet-lab.org
-    PLC_API_PATH=PLCAPI
-fi
+. /etc/planetlab/plc_config
 
 # Do not tolerate errors
 set -e
 
-NODEGROUP=$1
+# this is set by plc.d/bootmanager
+DEPLOYMENT=$1
 
 BOOTSTRAPDIR="/boot"
-if [ -n "$NODEGROUP" ] ; then
-	BOOTSTRAPDIR="/boot/$NODEGROUP"
-fi
-
 
 # Change to our source directory
-srcdir=$(cd $(dirname $0) && pwd -P)
+cd $(dirname $0)
 
 # Translate configuration file
-sed -i -e "s|SUPPORT_FILE_DIR=.*|SUPPORT_FILE_DIR=$BOOTSTRAPDIR|" $srcdir/source/configuration
+sed -i -e "s|SUPPORT_FILE_DIR=.*|SUPPORT_FILE_DIR=$BOOTSTRAPDIR|" source/configuration
 
 # Source bootmanager configuration
 . $srcdir/source/configuration
 
-# Write boot script. plc_www/boot/index.php writes this script out
-# after a nonce check.
+# Write boot script. nodeconfig/boot/index.php retrieves the contents of this script
+# after checking the node id
+
+BMDIR=/var/www/html/bootmanager
+mkdir -p $BMDIR
+
+DEST_SCRIPT="$BMDIR/${DEPLOYMENT}_bootmanager.sh"
+# Remove the old version or any sym links prior to re-writing
+rm -f ${DEST_SCRIPT}
+rm -f ${DEST_SCRIPT}.sgn
+
+
+# hard code 443 here.
+sed -i -e "s@^BOOT_API_SERVER.*@BOOT_API_SERVER=https://$PLC_API_HOST:443/$PLC_API_PATH/@" source/configuration
+
+sed -i -e "s@^BOOT_SERVER.*@BOOT_SERVER=$PLC_BOOT_HOST@" source/configuration
+if [ "$PLC_MONITOR_ENABLED" = "1" ]; then
+    MONITOR_SERVER=$PLC_MONITOR_HOST
+else
+    MONITOR_SERVER=$PLC_BOOT_HOST
+fi
+sed -i -e "s@^MONITOR_SERVER.*@MONITOR_SERVER=$MONITOR_SERVER@" source/configuration
+
+install -D -m 644 $PLC_BOOT_CA_SSL_CRT source/cacert/$PLC_BOOT_HOST/cacert.pem
+if [ -f $PLC_MONITOR_CA_SSL_CRT ] ; then 
+	install -D -m 644 $PLC_MONITOR_CA_SSL_CRT source/cacert/$PLC_MONITOR_HOST/cacert.pem
+fi
 
-DEST_SCRIPT=bootmanager.sh
-if [ -n "$NODEGROUP" ] ; then
-	DEST_SCRIPT="${NODEGROUP}_bootmanager.sh"
-	# Remove the old version or any sym links prior to re-writing
-	rm -f ${DEST_SCRIPT}
-	rm -f ${DEST_SCRIPT}.sgn
+# Replace the default debug SSH key
+if [ -f "$PLC_DEBUG_SSH_KEY_PUB" ] ; then
+    install -D -m 644 "$PLC_DEBUG_SSH_KEY_PUB" source/debug_files/debug_root_ssh_key
 fi
 
-cat > $DEST_SCRIPT <<EOF
+# Add python code from the following packages
+# make sure they are in the 'Requires' header of the specfile
+required_rpms="pypcilib pyplnet monitor-runlevelagent"
+extra_libs=`mktemp -d "/tmp/.bootmanager.XXXXXX"`
+mkdir $extra_libs/source
+cp -p $(rpm -ql $required_rpms | grep -v '\.py[co]$') $extra_libs/source
+
+
+########## create the bootmanager script
+cat <<EOF > $DEST_SCRIPT
 #!/bin/bash
 #
 # PlanetLab Boot Manager $VERSION
@@ -74,52 +97,21 @@ if [ ! -x \$UUDECODE ]; then
   chmod +x \$UUDECODE
 fi
 
+($UUDECODE | /bin/tar -C /tmp -xj) << _EOF_
 EOF
 
-echo '($UUDECODE | /bin/tar -C /tmp -xj) << _EOF_' >> $DEST_SCRIPT
-
-# XXX Currently, the value of PLC_API_PORT is set to 80 by default, so
-# that the portions of the web site that still use oldapi can continue
-# to work. However, the Boot Manager supports HTTPS access, which we
-# want to remain the default, so hard code 443 here.
-sed -i -e "s@^BOOT_API_SERVER.*@BOOT_API_SERVER=https://$PLC_API_HOST:443/$PLC_API_PATH/@" \
-    $srcdir/source/configuration
-
-sed -i -e "s@^BOOT_SERVER.*@BOOT_SERVER=$PLC_BOOT_HOST@" $srcdir/source/configuration
-if [ "$PLC_MONITOR_ENABLED" = "1" ]; then
-    MONITOR_SERVER=$PLC_MONITOR_HOST
-else
-    MONITOR_SERVER=$PLC_BOOT_HOST
-fi
-sed -i -e "s@^MONITOR_SERVER.*@MONITOR_SERVER=$MONITOR_SERVER@" $srcdir/source/configuration
-
-install -D -m 644 $PLC_BOOT_CA_SSL_CRT $srcdir/source/cacert/$PLC_BOOT_HOST/cacert.pem
-if [ -f $PLC_MONITOR_CA_SSL_CRT ] ; then 
-	install -D -m 644 $PLC_MONITOR_CA_SSL_CRT $srcdir/source/cacert/$PLC_MONITOR_HOST/cacert.pem
-fi
-
-# Replace the default debug SSH key
-if [ -f "$PLC_DEBUG_SSH_KEY_PUB" ] ; then
-    install -D -m 644 "$PLC_DEBUG_SSH_KEY_PUB" $srcdir/source/debug_files/debug_root_ssh_key
-fi
-
-# Add python code from the following packages
-# make sure they are in the 'Requires' header of the specfile
-required_rpms="pypcilib pyplnet monitor-runlevelagent"
-extra_libs=`mktemp -d "/tmp/.bootmanager.XXXXXX"`
-mkdir $extra_libs/source
-cp -p $(rpm -ql $required_rpms | grep -v '\.py[co]$') $extra_libs/source
 
 # Embed the uuencoded tarball in the script
 tar -cj -C $srcdir source/ -C $extra_libs source/ | uuencode -m - >> $DEST_SCRIPT
 
-# Remove temp directory
-rm -fr $extra_libs
-
+# wrap up the script
 echo '_EOF_' >> $DEST_SCRIPT
 echo 'cd /tmp/source' >> $DEST_SCRIPT
 echo 'chmod +x BootManager.py && ./BootManager.py' >> $DEST_SCRIPT
 
+# Remove temp directory
+rm -fr $extra_libs
+
 # Sign the whole script, if the keyring is on this machine.
 if [ -f "$PLC_ROOT_GPG_KEY" -a -f "$PLC_ROOT_GPG_KEY_PUB" ] ; then
     gpg --homedir=/root \
@@ -131,3 +123,4 @@ if [ -f "$PLC_ROOT_GPG_KEY" -a -f "$PLC_ROOT_GPG_KEY_PUB" ] ; then
 else
     echo "Warning: Remember to sign $PWD/$DEST_SCRIPT!" >&2
 fi
+