From 4dad82f5275fb8f0e539bd40e6ba379d9f57e315 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Fri, 2 Oct 2015 13:34:09 +0000 Subject: [PATCH] Fixes on deployment --- scripts/containers/deploy.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/containers/deploy.sh b/scripts/containers/deploy.sh index d30cce16..7bc57c76 100644 --- a/scripts/containers/deploy.sh +++ b/scripts/containers/deploy.sh @@ -133,23 +133,23 @@ EOF echo "> Checking if Orchestra is serving on https://${ip_addr}/admin/ ..." if [[ $noinput == '--noinput' ]]; then echo -e " - username: $user" - echo -e " - password: orchestra" + echo -e " - password: orchestra${normal}" fi - if [[ $(curl -L -k -v -c /tmp/cookies.txt -b /tmp/cookies.txt https://$ip_addr/admin/ | grep 'Panel Hosting Management') ]]; then + if [[ $(curl -L -k -c /tmp/cookies.txt -b /tmp/cookies.txt https://$ip_addr/admin/ | grep 'Panel Hosting Management') ]]; then token=$(grep csrftoken /tmp/cookies.txt | awk {'print $7'}) - if [[ $(curl -L -k -v -c /tmp/cookies.txt -b /tmp/cookies.txt \ + if [[ $(curl -L -k -c /tmp/cookies.txt -b /tmp/cookies.txt \ -d "username=$user&password=orchestra&csrfmiddlewaretoken=$token" \ -e https://$ip_addr/admin/ \ https://$ip_addr/admin/login/?next=/admin/ | grep 'Panel Hosting Management') ]]; then - echo " ** Orchestra appears to be working!" + echo "${bold} ** Orchestra appears to be working!${normal}" else - echo " ** Err. Couldn't login :(" >&2 + echo "${bold} ** Err. Couldn't login :(${normal}" >&2 fi else - echo " ** Err. Orchestra is not responding responding on https://${ip_addr}/admin/" >&2 + echo "${bold} ** Err. Orchestra is not responding responding on https://${ip_addr}/admin/${normal}" >&2 fi - echo ${normal} + echo } # Wrap it all on a function to avoid partial executions when running through wget/curl