From c8b3944857eb5046ea4a8b726ab7c01fd583efd7 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Fri, 2 Oct 2015 13:32:55 +0000 Subject: [PATCH] Fixes on deployment --- scripts/containers/deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/containers/deploy.sh b/scripts/containers/deploy.sh index 0ddeb9f6..d30cce16 100644 --- a/scripts/containers/deploy.sh +++ b/scripts/containers/deploy.sh @@ -136,12 +136,12 @@ EOF echo -e " - password: orchestra" fi - if [[ $(curl -L -k -v -c https://$ip_addr/admin/ -c /tmp/cookies.txt -b /tmp/cookies.txt | grep 'Panel Hosting Management') ]]; then + if [[ $(curl -L -k -v -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 \ -d "username=$user&password=orchestra&csrfmiddlewaretoken=$token" \ - https://$ip_addr/admin/login/?next=/admin/ \ - -e https://$ip_addr/admin/ | grep 'Panel Hosting Management') ]]; then + -e https://$ip_addr/admin/ \ + https://$ip_addr/admin/login/?next=/admin/ | grep 'Panel Hosting Management') ]]; then echo " ** Orchestra appears to be working!" else echo " ** Err. Couldn't login :(" >&2