Commit 97eab1c1 authored by Jérome Perrin's avatar Jérome Perrin

deploy-test: follow up mktemp changes

see slapos.core!418
parent ddf132c0
...@@ -1950,10 +1950,10 @@ function download_playbook { ...@@ -1950,10 +1950,10 @@ function download_playbook {
if [ ! -f /etc/opt/slapcache.cfg ]; then if [ ! -f /etc/opt/slapcache.cfg ]; then
slapcache-conf slapcache-conf
fi fi
DFILE="/tmp/tmpplaybook$(basename $0).$$/" DFILE=$(mktemp -d -t "$(basename "$0")"-XXXXXXXXXXXX)
TFILE="archive.tar.gz" TFILE="archive.tar.gz"
mkdir -p $DFILE mkdir -p $DFILE
cd $DFILE cd "$DFILE" || exit 1
slapcache-download --destination=$TFILE slapcache-download --destination=$TFILE
tar -xzvf $TFILE tar -xzvf $TFILE
rm $TFILE rm $TFILE
...@@ -2198,10 +2198,11 @@ if [ ! -f /etc/opt/slapcache.cfg ]; then ...@@ -2198,10 +2198,11 @@ if [ ! -f /etc/opt/slapcache.cfg ]; then
fi fi
sed -i "s/key = slapos-global-key/key = slapos-global-official-vifib-key/g" /etc/opt/slapcache.cfg sed -i "s/key = slapos-global-key/key = slapos-global-official-vifib-key/g" /etc/opt/slapcache.cfg
DFILE="/tmp/tmpplaybook_unstable$(basename $0).$$/"
DFILE=$(mktemp -d -t "$(basename "$0")"-XXXXXXXXXXXX)
TFILE="archive.tar.gz" TFILE="archive.tar.gz"
mkdir -p $DFILE mkdir -p $DFILE
cd $DFILE cd "$DFILE" || exit 1
wget -O $TFILE http://10.0.2.100/playbook.tar.gz wget -O $TFILE http://10.0.2.100/playbook.tar.gz
tar -xzvf $TFILE tar -xzvf $TFILE
rm $TFILE rm $TFILE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment