From fbca40840d96b24410cb324c0bf2bf7e9c6ce9ef Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Mon, 23 Jun 2014 19:54:48 +0200
Subject: [PATCH] MT#7621 Adjust checks and copy actions for new log file
 location

---
 ec2-create-ce | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ec2-create-ce b/ec2-create-ce
index 47d3786..b8d93fc 100755
--- a/ec2-create-ce
+++ b/ec2-create-ce
@@ -187,6 +187,7 @@ cat > "$USER_DATA_FILE" << EOF
 wget -O /tmp/ngcp-installer.deb http://deb.sipwise.com/spce/ngcp-installer-${NGCP_RELEASE}.deb
 dpkg -i /tmp/ngcp-installer.deb
 echo y | ngcp-installer 2>&1 | tee -a /var/log/ngcp-installer-debug.log
+cp /tmp/ngcp-installer.log /var/log/ngcp-installer.log
 EOF
 
 LOGFILE_RUN="$(mktemp)"
@@ -239,7 +240,7 @@ retry=360 # up to 30 minutes
 FINISHED_NGCP_CE_INSTALLATION=false
 while [ "$FINISHED_NGCP_CE_INSTALLATION" != "true" ] && [ $retry -ne 0 ] ; do
   ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" -i "${KEY_FILE}" "admin@$HOSTNAME" \
-  "grep -q 'Installation finished. Thanks for choosing NGCP' /tmp/ngcp-installer-debug.log"
+  "grep -q 'Installation finished. Thanks for choosing NGCP' /var/log/ngcp-installer-debug.log"
   RC=$?
   if [ $RC -eq 0 ] ; then
     FINISHED_NGCP_CE_INSTALLATION=true
@@ -251,7 +252,7 @@ while [ "$FINISHED_NGCP_CE_INSTALLATION" != "true" ] && [ $retry -ne 0 ] ; do
 done
 
 echo "Trying to retrieve ngcp-installer log files"
-scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" -i "${KEY_FILE}" "admin@$HOSTNAME":/tmp/ngcp-installer\*log ./ || true
+scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" -i "${KEY_FILE}" "admin@$HOSTNAME":/var/log/ngcp-installer\*log ./ || true
 
 if [ "$FINISHED_NGCP_CE_INSTALLATION" = "true" ] ; then
   echo "Successfully finished ngcp CE installation (version ${NGCP_VERSION})."